From cdc539d5616b9b8806a73db3b9e5270deda45472 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 22 Sep 2008 09:28:13 +0000
Subject: - there's no 'locale_string' option now

---
 program/include/rcube_config.php | 4 ----
 program/localization/index.inc   | 1 -
 2 files changed, 5 deletions(-)

(limited to 'program')

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',
 );
 
-
 ?>
-- 
cgit v1.2.3