holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need to load not autoloadable widgets, in fact is messes up loading order in old etemplate editor

Browse Source
This commit is contained in:
Ralf Becker 2013-11-04 10:23:42 +00:00
parent c53b5748a7
commit e2b9443fa0
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/inc/class.editor.inc.php
View File

@ -4,7 +4,7 @@
* *
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de> * @author Ralf Becker <RalfBecker@outdoor-training.de>
* @copyright 2002-12 by RalfBecker@outdoor-training.de * @copyright 2002-13 by RalfBecker@outdoor-training.de
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package etemplate * @package etemplate
* @subpackage tools * @subpackage tools
@ -1599,8 +1599,8 @@ class editor
$dir = @opendir(EGW_SERVER_ROOT.'/'.$app.'/inc'); $dir = @opendir(EGW_SERVER_ROOT.'/'.$app.'/inc');
while ($dir && ($file = readdir($dir))) while ($dir && ($file = readdir($dir)))
{ {
// ignore et2 widgets, causing problems with old editor // ignore et2 base widget matching name-schema of old eTemplate
if (in_array($file, array('class.etemplate_widget.inc.php', 'class.contact_widget.inc.php'))) continue; if ($file == 'class.etemplate_widget.inc.php') continue;
if (preg_match('/class\\.([a-zA-Z0-9_]*)_widget.inc.php/',$file,$regs) && if (preg_match('/class\\.([a-zA-Z0-9_]*)_widget.inc.php/',$file,$regs) &&
($regs[1] != 'xslt' || $this->etemplate->xslt) && ($regs[1] != 'xslt' || $this->etemplate->xslt) &&

9
etemplate/inc/class.etemplate_widget.inc.php
View File

@ -7,17 +7,10 @@
* @subpackage api * @subpackage api
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de> * @author Ralf Becker <RalfBecker@outdoor-training.de>
* @copyright 2002-11 by RalfBecker@outdoor-training.de * @copyright 2002-13 by RalfBecker@outdoor-training.de
* @version $Id$ * @version $Id$
*/ */
// include only widgets which can't be autoloaded (or contain sub-widgets which cant)
require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_textbox.inc.php';
require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_grid.inc.php';
require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.etemplate_widget_checkbox.inc.php';
require_once EGW_INCLUDE_ROOT.'/etemplate/inc/class.contact_widget.inc.php';
include_once EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_widget_filter.inc.php';
/** /**
* eTemplate widget baseclass * eTemplate widget baseclass
* *