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

Revert "fix some errors in new phpUnit tests: define lang() only if not already done"

Browse Source 
This reverts commit ab289eb5c1.
This commit is contained in:
Ralf Becker 2020-03-04 21:19:33 +01:00
parent ab289eb5c1
commit aa4750009f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup/inc/functions.inc.php
View File

@ -56,17 +56,14 @@ require_once(EGW_INCLUDE_ROOT . '/api/src/loader/common.php');
* function to handle multilanguage support * function to handle multilanguage support
* *
*/ */
if (!function_exists('lang')) function lang($key,$vars=null)
{ {
function lang($key, $vars = null) if(!is_array($vars))
{ {
if (!is_array($vars)) $vars = func_get_args();
{ array_shift($vars); // remove $key
$vars = func_get_args();
array_shift($vars); // remove $key
}
return $GLOBALS['egw_setup']->translation->translate("$key", $vars);
} }
return $GLOBALS['egw_setup']->translation->translate("$key", $vars);
} }
if(file_exists(EGW_SERVER_ROOT.'/api/setup/setup.inc.php')) if(file_exists(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'))