fix PHP Warning: Declaration of EGroupware\\Api\\CalDAV::ServeRequest() should be compatible with HTTP_WebDAV_Server::ServeRequest($prefix = NULL)

This commit is contained in:
Ralf Becker 2016-06-09 09:00:57 +02:00
parent b381843d01
commit 5643f0f6c2

View File

@ -2032,8 +2032,10 @@ class CalDAV extends HTTP_WebDAV_Server
* Serve WebDAV HTTP request * Serve WebDAV HTTP request
* *
* Reimplemented to add logging * Reimplemented to add logging
*
* @param $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
*/ */
function ServeRequest() function ServeRequest($prefix=null)
{ {
if ((self::$log_level=$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' || if ((self::$log_level=$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' ||
self::$log_level === 'f' || $this->debug) self::$log_level === 'f' || $this->debug)
@ -2045,7 +2047,7 @@ class CalDAV extends HTTP_WebDAV_Server
substr($_SERVER['CONTENT_TYPE'], 0, 5) == 'text/'; substr($_SERVER['CONTENT_TYPE'], 0, 5) == 'text/';
ob_start(); ob_start();
} }
parent::ServeRequest(); parent::ServeRequest($prefix);
if (self::$request_starttime) self::log_request(); if (self::$request_starttime) self::log_request();
} }