diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 360c52349b..7b6a960b64 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-02-28 Miguel de Dios + + * include/functions_config.php, include/functions_io.php: fixed the + update the config without enterprise version. + + Fixes: #3606331 + 2013-02-28 Miguel de Dios * include/functions_reporting.php: fixed php warning message when diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 5ba648a340..35b734f891 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -167,7 +167,7 @@ function config_update_config () { $values = array("value" => $license_info_key); $where = array("key" => 'customer_key'); $update_manage_settings_result = db_process_sql_update('tupdate_settings', $values, $where); - if (!$update_manage_settings_result) + if ($update_manage_settings_result === false) $error_update[] = __('License information'); } } @@ -500,7 +500,7 @@ function config_update_config () { $config['error_config_update_config'] = array(); $config['error_config_update_config']['correct'] = false; $values = implode(', ', $error_update); - $config['error_config_update_config']['message'] = sprint(__('Failed updated: the next values cannot update: %s'), $values); + $config['error_config_update_config']['message'] = sprintf(__('Failed updated: the next values cannot update: %s'), $values); } else { $config['error_config_update_config'] = array(); diff --git a/pandora_console/include/functions_io.php b/pandora_console/include/functions_io.php index a9674b065f..fdc2ba05c1 100755 --- a/pandora_console/include/functions_io.php +++ b/pandora_console/include/functions_io.php @@ -382,17 +382,19 @@ function __ ($string /*, variable arguments */) { return $tranlateString; } } - elseif ($config['enterprise_installed'] && - isset($config['translate_string_extension_installed']) && - $config['translate_string_extension_installed'] == 1 && - array_key_exists('translate_string.php', $extensions)) { - - enterprise_include_once('extensions/translate_string/functions.php'); - - $tranlateString = get_defined_translation($string); - - if ($tranlateString !== false) { - return $tranlateString; + elseif (isset($config['enterprise_installed'])) { + if ($config['enterprise_installed'] && + isset($config['translate_string_extension_installed']) && + $config['translate_string_extension_installed'] == 1 && + array_key_exists('translate_string.php', $extensions)) { + + enterprise_include_once('extensions/translate_string/functions.php'); + + $tranlateString = get_defined_translation($string); + + if ($tranlateString !== false) { + return $tranlateString; + } } }