"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:
Ralf Becker 2010-05-09 20:25:00 +00:00
parent 2f2bc79253
commit 5e3b6067c7

View File

@ -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')
{ {
@ -217,7 +217,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,
); );
} }
@ -535,7 +535,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;