fix PHP 5.6 Deprecated: Non-static method calendar_uiviews::integration_get_popup() should not be called statically

This commit is contained in:
Ralf Becker 2015-07-03 09:10:01 +00:00
parent f99183959f
commit f778150b5d

View File

@ -255,7 +255,7 @@ class calendar_uiviews extends calendar_ui
// Actually, this takes care of most of it... // Actually, this takes care of most of it...
$this->week(); $this->week();
$tmpl = new etemplate_new('calendar.planner'); $tmpl = new etemplate_new('calendar.planner');
// Get the actions // Get the actions
$tmpl->setElementAttribute('planner','actions',$this->get_actions()); $tmpl->setElementAttribute('planner','actions',$this->get_actions());
@ -925,7 +925,7 @@ class calendar_uiviews extends calendar_ui
// Get the actions // Get the actions
$tmpl->setElementAttribute('view','actions',$this->get_actions()); $tmpl->setElementAttribute('view','actions',$this->get_actions());
$tmpl->exec(__METHOD__, $content); $tmpl->exec(__METHOD__, $content);
} }
@ -1970,7 +1970,7 @@ class calendar_uiviews extends calendar_ui
* @param int|string $id * @param int|string $id
* @return string * @return string
*/ */
function integration_get_popup($app,$id) public static function integration_get_popup($app,$id)
{ {
$app_data = calendar_bo::integration_get_data($app,'edit_link'); $app_data = calendar_bo::integration_get_data($app,'edit_link');
@ -2927,7 +2927,7 @@ class calendar_uiviews extends calendar_ui
$actions['timesheet']['open'] = '{"app": "timesheet", "type": "add", "extra": "link_app[]=$app&link_id[]=$id"}'; $actions['timesheet']['open'] = '{"app": "timesheet", "type": "add", "extra": "link_app[]=$app&link_id[]=$id"}';
$actions['timesheet']['onExecute'] = 'javaScript:app.calendar.action_open'; $actions['timesheet']['onExecute'] = 'javaScript:app.calendar.action_open';
} }
return $actions; return $actions;
} }