Describe Framework requirements, drop some redundant code (since we require mbstring)

program/lib/Roundcube/README.md

@@ -16,6 +16,15 @@ tasks:
 - VCard parsing and writing
 
 
+REQUIREMENTS
+------------
+PHP Version 5.4 or greater including:
+   - PCRE, DOM, JSON, Session, Sockets, OpenSSL, Mbstring (required)
+   - PHP PDO with driver for either MySQL, PostgreSQL, SQL Server, Oracle or SQLite (required)
+   - Libiconv, Zip, Fileinfo, Intl, Exif (recommended)
+   - LDAP for LDAP addressbook support (optional)
+
+
 INSTALLATION
 ------------
 Copy all files of this directory to your project or install it in the default

program/lib/Roundcube/rcube_charset.php

@@ -277,9 +277,6 @@ class rcube_charset
                     return $out;
                 }
             }
-            else if ($from == 'ISO-8859-1' && function_exists('utf8_encode')) {
-                return utf8_encode($str);
-            }
         }
 
         // encode string for output
@@ -290,9 +287,6 @@ class rcube_charset
                     return $out;
                 }
             }
-            else if ($to == 'ISO-8859-1' && function_exists('utf8_decode')) {
-                return utf8_decode($str);
-            }
         }
 
         if (!isset($out)) {