mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
"fix for bub #2579 - PHP Fatal error: Using $this when not in object context
--> get_path can NOT be static"
This commit is contained in:
parent
6f5cc0c387
commit
26667d4b6e
@ -73,7 +73,7 @@ class calendar_groupdav extends groupdav_handler
|
|||||||
* @param array|int $event
|
* @param array|int $event
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
static function get_path($event)
|
function get_path($event)
|
||||||
{
|
{
|
||||||
if (is_numeric($event) && self::PATH_ATTRIBUTE == 'id')
|
if (is_numeric($event) && self::PATH_ATTRIBUTE == 'id')
|
||||||
{
|
{
|
||||||
@ -209,7 +209,7 @@ class calendar_groupdav extends groupdav_handler
|
|||||||
$props[] = HTTP_WebDAV_Server::mkprop('getcontentlength', ''); // expensive to calculate and no CalDAV client uses it
|
$props[] = HTTP_WebDAV_Server::mkprop('getcontentlength', ''); // expensive to calculate and no CalDAV client uses it
|
||||||
}
|
}
|
||||||
$files[] = array(
|
$files[] = array(
|
||||||
'path' => $path.self::get_path($event),
|
'path' => $path.$this->get_path($event),
|
||||||
'props' => $props,
|
'props' => $props,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -528,7 +528,7 @@ class calendar_groupdav extends groupdav_handler
|
|||||||
{
|
{
|
||||||
$path = preg_replace('|(.*)/[^/]*|', '\1/', $options['path']);
|
$path = preg_replace('|(.*)/[^/]*|', '\1/', $options['path']);
|
||||||
if ($this->debug) error_log(__METHOD__."(,$id,$user) cal_id=$cal_id: $retval");
|
if ($this->debug) error_log(__METHOD__."(,$id,$user) cal_id=$cal_id: $retval");
|
||||||
header('Location: '.$this->base_uri.$path.self::get_path($cal_id));
|
header('Location: '.$this->base_uri.$path.$this->get_path($cal_id));
|
||||||
return $retval;
|
return $retval;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user