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

- load translations for etemplate too, if called from other app

Browse Source 
- added phpgw_footer for stable
- some checks for sel_options
This commit is contained in:
Ralf Becker 2002-10-06 00:20:32 +00:00
parent e638e17ed3
commit 0bcaa1b8b3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,7 +97,10 @@
$changes = array(); $changes = array();
} }
$GLOBALS['phpgw']->common->phpgw_header(); $GLOBALS['phpgw']->common->phpgw_header();
if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'etemplate')
{
$GLOBALS['phpgw']->translation->add_app('etemplate'); // some extensions have own texts
}
$id = $this->appsession_id(); $id = $this->appsession_id();
$GLOBALS['phpgw_info']['etemplate']['loop'] = False; $GLOBALS['phpgw_info']['etemplate']['loop'] = False;
$GLOBALS['phpgw_info']['etemplate']['form_options'] = ''; // might be set in show $GLOBALS['phpgw_info']['etemplate']['form_options'] = ''; // might be set in show
@ -129,6 +132,7 @@
if ($this->stable) if ($this->stable)
{ {
echo parse_navbar() . $html; echo parse_navbar() . $html;
$GLOBALS['phpgw']->common->phpgw_footer();
} }
else else
{ {
@ -581,14 +585,14 @@
$sels += $cell['sel_options']; $sels += $cell['sel_options'];
} }
} }
if (isset($sel_options[$name])) if (isset($sel_options[$name]) && is_array($sel_options[$name]))
{ {
$sels += $sel_options[$name]; $sels += $sel_options[$name];
} }
elseif (count($name_parts)) elseif (count($name_parts))
{ {
$org_name = $name_parts[count($name_parts)-1]; $org_name = $name_parts[count($name_parts)-1];
if (isset($sel_options[$org_name])) if (isset($sel_options[$org_name]) && is_array($sel_options[$org_name]))
{ {
$sels += $sel_options[$org_name]; $sels += $sel_options[$org_name];
} }