From 0ac41603d424a889e83b156b3128581eec0f931f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 19 Jan 2012 09:04:20 -0500
Subject: [PATCH] - Better handling of legacy config (#1488312)
---
program/include/rcube_config.php | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index f2c20f5..7eb2950 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -5,7 +5,7 @@
| program/include/rcube_config.php |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2008-2010, The Roundcube Dev Team |
+ | Copyright (C) 2008-2012, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -32,6 +32,18 @@
private $prop = array();
private $errors = array();
private $userprefs = array();
+
+ /**
+ * Renamed options
+ *
+ * @var array
+ */
+ private $legacy_props = array(
+ // new name => old name
+ 'default_folders' => 'default_imap_folders',
+ 'mail_pagesize' => 'pagesize',
+ 'addressbook_pagesize' => 'pagesize',
+ );
/**
@@ -164,9 +176,18 @@
*/
public function get($name, $def = null)
{
- $result = isset($this->prop[$name]) ? $this->prop[$name] : $def;
+ if (isset($this->prop[$name])) {
+ $result = $this->prop[$name];
+ }
+ else if (isset($this->lagacy_props[$name])) {
+ return $this->get($this->lagacy_props[$name], $def);
+ }
+ else {
+ $result = $def;
+ }
+
$rcmail = rcmail::get_instance();
-
+
if ($name == 'timezone' && isset($this->prop['_timezone_value']))
$result = $this->prop['_timezone_value'];
--
Gitblit v1.9.1