extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed / reverted some earlier fixes which caused other problems

Browse Source
This commit is contained in:
Ralf Becker 2006-04-06 18:39:34 +00:00
parent c8996cb302
commit 4794146748
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
etemplate/inc/class.uietemplate.inc.php
View File

@ -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);
}