From 651da7934ed4c13e2cbc2e4a82caf2ebaba87373 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 14 Apr 2012 02:28:10 -0400
Subject: [PATCH] - Fix folder collapsing/expanding broken with framework merge (#1488430)
---
installer/rcube_install.php | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index cc946ec..4d4f57a 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -6,10 +6,13 @@
| |
| This file is part of the Roundcube Webmail package |
| Copyright (C) 2008-2011, The Roundcube Dev Team |
- | Licensed under the GNU Public License |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
+-----------------------------------------------------------------------+
- $Id: $
+ $Id$
*/
@@ -41,12 +44,13 @@
'addrbook_show_images' => 'show_images',
'imap_root' => 'imap_ns_personal',
'pagesize' => 'mail_pagesize',
+ 'default_imap_folders' => 'default_folders',
);
// these config options are required for a working system
var $required_config = array(
'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers',
- 'des_key', 'session_lifetime',
+ 'des_key', 'session_lifetime', 'support_url',
);
/**
@@ -179,9 +183,9 @@
else if ($prop == 'smtp_pass' && !empty($_POST['_smtp_user_u'])) {
$value = '%p';
}
- else if ($prop == 'default_imap_folders') {
+ else if ($prop == 'default_folders') {
$value = array();
- foreach ($this->config['default_imap_folders'] as $_folder) {
+ foreach ($this->config['default_folders'] as $_folder) {
switch ($_folder) {
case 'Drafts': $_folder = $this->config['drafts_mbox']; break;
case 'Sent': $_folder = $this->config['sent_mbox']; break;
@@ -250,7 +254,7 @@
// iterate over default config
foreach ($defaults as $prop => $value) {
- if (!isset($seen[$prop]) && !isset($this->config[$prop]) && isset($required[$prop]))
+ if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop])))
$out['missing'][] = array('prop' => $prop);
}
@@ -519,7 +523,8 @@
'0.4-beta', '0.4.2',
'0.5-beta', '0.5', '0.5.1',
'0.6-beta', '0.6',
- '0.7-beta', '0.7', '0.7.1'
+ '0.7-beta', '0.7', '0.7.1', '0.7.2',
+ '0.8-beta',
));
return $select;
}
--
Gitblit v1.9.1