[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] setup/inc functions.inc.php
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] setup/inc functions.inc.php |
Date: |
Mon, 25 Sep 2006 02:03:47 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: setup
Changes by: Dave Hall <skwashd> 06/09/25 02:03:47
Modified files:
inc : functions.inc.php
Log message:
referencing wrong object
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/inc/functions.inc.php?cvsroot=phpgroupware&r1=1.53&r2=1.54
Patches:
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/functions.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- functions.inc.php 24 Sep 2006 12:13:10 -0000 1.53
+++ functions.inc.php 25 Sep 2006 02:03:47 -0000 1.54
@@ -15,7 +15,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: functions.inc.php,v 1.53 2006/09/24 12:13:10 skwashd Exp $ */
+ /* $Id: functions.inc.php,v 1.54 2006/09/25 02:03:47 skwashd Exp $ */
// PHP5 compat fix
if (version_compare(phpversion(), '5.0') < 0)
@@ -95,11 +95,11 @@
$vars = array($m1,$m2,$m3,$m4,$m5,$m6,$m7,$m8,$m9,$m10);
}
- if ( !isset($GLOBALS['phpgw']->translation) ||
!is_object($GLOBALS['phpgw']->translation) )
+ if ( !isset($GLOBALS['phpgw_setup']->translation) ||
!is_object($GLOBALS['phpgw_setup']->translation) )
{
return sprintf( preg_replace('/(%\d)+/', '%s', $key),
$m1, $m2, $m3, $m4, $m5, $m6, $m7, $m8, $m9, $m10) . ' *#*';
}
- return $GLOBALS['phpgw']->translation->translate("$key", $vars);
+ return $GLOBALS['phpgw_setup']->translation->translate("$key",
$vars);
}
/**