summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-11-19 14:45:49 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-11-19 14:45:49 +0000
commit68b4ac324209df1923a65c616076e601993bf530 (patch)
tree5a5279fb808212e91d826f22e3c5a8144363a1ea
parent10617724ebdc45e634c4c859aae2ecbbc8f5d181 (diff)
Cast to array because this could be empty; update requirements description
git-svn-id: https://svn.roundcube.net/trunk@919 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/INSTALL11
-rw-r--r--roundcubemail/program/include/rcube_imap.inc2
2 files changed, 8 insertions, 5 deletions
diff --git a/roundcubemail/INSTALL b/roundcubemail/INSTALL
index 5dd3485e7..3d8ac1183 100644
--- a/roundcubemail/INSTALL
+++ b/roundcubemail/INSTALL
@@ -2,17 +2,20 @@
REQUIREMENTS
============
-* The Apache Webserver
+* The Apache or Lighttpd Webserver
* .htaccess support allowing overrides for DirectoryIndex
-* PHP Version 4.3.1 or greater
-* PCRE (perl compatible regular expression) installed with PHP
+* PHP Version 4.3.1 or greater including
+ - PCRE (perl compatible regular expression)
+ - libiconv (recommended)
+ - mbstring (optional)
* php.ini options:
- error_reporting E_ALL & ~E_NOTICE (or lower)
- file_uploads on (for attachment upload features)
- memory_limit (increase as suitable to support large attachments)
* PHP compiled with Open SSL to connect to IMAPS and to use the spell checker
* A MySQL or PostgreSQL database engine or the SQLite extension for PHP
-* A database with permission to create tables
+* One of the above databases with permission to create tables
+* An SMTP server or PHP configured for mail delivery
INSTALLATION
diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc
index ea80ced10..5be4943e4 100644
--- a/roundcubemail/program/include/rcube_imap.inc
+++ b/roundcubemail/program/include/rcube_imap.inc
@@ -2494,7 +2494,7 @@ class rcube_imap
if (!$mbox_name)
$mbox_name = $this->mailbox;
- $index = array_flip($this->uid_id_map[$mbox_name]);
+ $index = array_flip((array)$this->uid_id_map[$mbox_name]);
if (isset($index[$id]))
$uid = $index[$id];
else