summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/include/rcube_config.php4
-rw-r--r--program/localization/index.inc1
2 files changed, 0 insertions, 5 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index c3b0c1832..0723834bf 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -75,10 +75,6 @@ class rcube_config
$this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
$this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
- // handle aliases
- if (isset($this->prop['locale_string']) && empty($this->prop['language']))
- $this->prop['language'] = $this->prop['locale_string'];
-
// set PHP error logging according to config
if ($this->prop['debug_level'] & 1) {
ini_set('log_errors', 1);
diff --git a/program/localization/index.inc b/program/localization/index.inc
index ba87d914f..215dfa7d3 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -128,5 +128,4 @@ $rcube_language_aliases = array(
'zh' => 'zh_CN',
);
-
?>