[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php,1.223
From: |
ceb |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php,1.223 |
Date: |
Thu, 24 Feb 2005 15:58:27 -0000 |
Update of phpgwapi/inc
Modified Files:
Branch: MAIN
class.common.inc.php lines: +5 -5
Log Message:
applied patch 3642
====================================================
Index: phpgwapi/inc/class.common.inc.php
diff -u phpgwapi/inc/class.common.inc.php:1.222
phpgwapi/inc/class.common.inc.php:1.223
--- phpgwapi/inc/class.common.inc.php:1.222 Thu Dec 30 11:10:47 2004
+++ phpgwapi/inc/class.common.inc.php Thu Jan 13 11:29:47 2005
@@ -706,7 +706,7 @@
* Get template dir of an application
*
* @param string $appname appication name optional can be
derived from $phpgw_info['flags']['currentapp'];
- * @param string? $layout ?????
+ * @param string? $layout optional can force the template set to
a specific layout
*/
function get_tpl_dir($appname = '',$layout = '')
{
@@ -745,9 +745,9 @@
$tpldir = PHPGW_SERVER_ROOT . '/' . $appname .
'/templates/' . $GLOBALS['phpgw_info']['server']['template_set'];
$tpldir_default = PHPGW_SERVER_ROOT . '/' . $appname .
'/templates/simple';
- if ($layout == 'simple')
+ if ($layout)
{
- $tpldir = $tpldir_default;
+ $tpldir = $tpldir_default = PHPGW_SERVER_ROOT .
'/' . $appname . '/templates/' . $layout;
}
if (@is_dir($tpldir))
@@ -1761,7 +1761,7 @@
return;
}
-
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi','default') .
SEP . 'msgbox');
+
$GLOBALS['phpgw']->xslttpl->add_file($this->get_tpl_dir('phpgwapi','base') .
SEP . 'msgbox');
$prev_helper =
$GLOBALS['phpgw']->translation->translator_helper;
$GLOBALS['phpgw']->translation->translator_helper = '';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.common.inc.php,1.223,
ceb <=