[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: etemplate/inc class.uietemplate.inc.php,1.37,1.3
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: etemplate/inc class.uietemplate.inc.php,1.37,1.38 |
Date: |
Sat, 05 Oct 2002 20:20:34 -0400 |
Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv19385
Modified Files:
class.uietemplate.inc.php
Log Message:
- load translations for etemplate too, if called from other app
- added phpgw_footer for stable
- some checks for sel_options
Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** class.uietemplate.inc.php 4 Oct 2002 23:15:46 -0000 1.37
--- class.uietemplate.inc.php 6 Oct 2002 00:20:32 -0000 1.38
***************
*** 98,102 ****
}
$GLOBALS['phpgw']->common->phpgw_header();
!
$id = $this->appsession_id();
$GLOBALS['phpgw_info']['etemplate']['loop'] = False;
--- 98,105 ----
}
$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();
$GLOBALS['phpgw_info']['etemplate']['loop'] = False;
***************
*** 130,133 ****
--- 133,137 ----
{
echo parse_navbar() . $html;
+ $GLOBALS['phpgw']->common->phpgw_footer();
}
else
***************
*** 582,586 ****
}
}
! if (isset($sel_options[$name]))
{
$sels += $sel_options[$name];
--- 586,590 ----
}
}
! if (isset($sel_options[$name]) &&
is_array($sel_options[$name]))
{
$sels += $sel_options[$name];
***************
*** 589,593 ****
{
$org_name =
$name_parts[count($name_parts)-1];
! if
(isset($sel_options[$org_name]))
{
$sels +=
$sel_options[$org_name];
--- 593,597 ----
{
$org_name =
$name_parts[count($name_parts)-1];
! if
(isset($sel_options[$org_name]) && is_array($sel_options[$org_name]))
{
$sels +=
$sel_options[$org_name];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: etemplate/inc class.uietemplate.inc.php,1.37,1.38,
Ralf Becker <address@hidden> <=