[eGroupWare-svn] r55984 - /trunk/calendar/inc/class.calendar_hooks.inc.php

[email protected] Mon, 02 May 2016 20:21:59 -0000
Newsgroups gmane.comp.web.egroupware.cvs
Message-ID <[email protected]>
Author: ralfbecker
Date: Mon May  2 22:21:59 2016
New Revision: 55984

URL: http://svn.stylite.de/viewvc/egroupware?rev=55984&view=rev
Log:
do not instanciate eT2 Widget in setup (no need, and gives autoloading conflict), also calling static calendar_bo method static

Modified:
    trunk/calendar/inc/class.calendar_hooks.inc.php

Modified: trunk/calendar/inc/class.calendar_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_hooks.inc.php?rev=55984&r1=55983&r2=55984&view=diff
==============================================================================
--- trunk/calendar/inc/class.calendar_hooks.inc.php (original)
+++ trunk/calendar/inc/class.calendar_hooks.inc.php Mon May  2 22:21:59 2016
@@ -155,8 +155,10 @@
 			'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 @@
 			$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',


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z