From 47941467485e4405174b43e83efe467cd8e79a05 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 6 Apr 2006 18:39:34 +0000 Subject: [PATCH] removed / reverted some earlier fixes which caused other problems --- etemplate/inc/class.uietemplate.inc.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php index ad9cf7dc6a..746450fb39 100644 --- a/etemplate/inc/class.uietemplate.inc.php +++ b/etemplate/inc/class.uietemplate.inc.php @@ -78,12 +78,12 @@ { $GLOBALS['egw']->html =& CreateObject('phpgwapi.html'); } - if (!is_object($GLOBALS['egw']->template)) - { - $GLOBALS['egw']->template =& CreateObject('phpgwapi.template'); - } $this->html = &$GLOBALS['egw']->html; + if (!is_object($GLOBALS['egw']->template)) + { + $GLOBALS['egw']->template =& CreateObject('phpgwapi.Template'); + } $this->boetemplate($name,$load_via); $this->xslt = is_object($GLOBALS['egw']->xslttpl); @@ -1240,14 +1240,6 @@ { $sels += $content["options-$name"]; } - if (empty($sels) && $cell['name']{0} = '#') - { - if(!is_array($this->customfields)) - { - $this->customfields =& ExecMethod2('admin.customfields.get_customfields', $GLOBALS['egw_info']['flags']['currentapp']); - } - $sels = (array)$this->customfields[substr($cell['name'],1)]['values']; - } if ($multiple && !is_array($value)) $value = explode(',',$value); if ($readonly || $cell['noprint']) { @@ -1483,7 +1475,7 @@ } if ($extra_label && ($label != '' || $html == '')) { - if (strlen($label) > 1 && !$cell['no_lang'] && !($cell['label'] != $label || (int)$cell['no_lang'] == 2)) + if (strlen($label) > 1 && !($cell['no_lang'] && $cell['label'] != $label || (int)$cell['no_lang'] == 2)) { $label = lang($label); }