do not instanciate eT2 Widget in setup (no need, and gives autoloading conflict), also calling static calendar_bo method static

This commit is contained in:
Ralf Becker 2016-05-02 20:21:59 +00:00
parent 5d14807720
commit c15a722f3a

View File

@ -155,8 +155,10 @@ class calendar_hooks
'Saturday' => lang('Saturday')
);
$times = Api\Etemplate\Widget\Select::typeOptions('select-time', '');
if (!isset($hook_data['setup']))
{
$times = Api\Etemplate\Widget\Select::typeOptions('select-time', '');
}
for ($i = 2; $i <= 4; ++$i)
{
$muliple_weeks[$i] = lang('%1 weeks',$i);
@ -210,7 +212,7 @@ class calendar_hooks
$export_tzs = array('0' => 'Use Event TZ');
$export_tzs += Api\DateTime::getTimezones();
}
$link_title_options = ExecMethod('calendar.calendar_bo.get_link_options');
$link_title_options = calendar_bo::get_link_options();
$settings = array(
'1.section' => array(
'type' => 'section',