Merge branch '3156-Translate-string-no-funciona' into 'develop'

fixed bug in function __()

See merge request artica/pandorafms!2023

Former-commit-id: 5fbbb662fdb7a044a3c616521158bcfa24e50413
This commit is contained in:
Alejandro Fraguas 2019-01-18 13:37:11 +01:00
commit b3011e419a

View File

@ -375,8 +375,8 @@ function __ ($string /*, variable arguments */) {
global $config; global $config;
static $extensions_cache = array(); static $extensions_cache = array();
if( !isset($config["id_user"]) && count($extensions_cache) > 0 ) { if( isset($config["id_user"]) ) {
if (array_key_exists($config["id_user"], $extensions_cache)) { if ( count($extensions_cache) > 0 && array_key_exists($config["id_user"], $extensions_cache)) {
$extensions = $extensions_cache[$config["id_user"]]; $extensions = $extensions_cache[$config["id_user"]];
} }
else { else {
@ -385,8 +385,9 @@ function __ ($string /*, variable arguments */) {
} }
} }
else{ else{
$extension =null; $extensions=null;
} }
if (empty($extensions)) if (empty($extensions))
$extensions = array(); $extensions = array();