#1485505: PHP bug (?) workaround for html2text class autoloading

git-svn-id: https://svn.roundcube.net/trunk@1986 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 12 insertions, 2 deletions

diff --git a/roundcubemail/program/include/iniset.php b/roundcubemail/program/include/iniset.php
index f81c04a90..2be15b1a5 100755
--- a/roundcubemail/program/include/iniset.php
+++ b/roundcubemail/program/include/iniset.php
@@ -75,8 +75,18 @@ if(extension_loaded('mbstring'))
 function __autoload($classname)
 {
   $filename = preg_replace(
-      array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
-      array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+      array('/MDB2_(.+)/',
+    	    '/Mail_(.+)/',
+	    '/^html_.+/',
+	    '/^utf8$/',
+	    '/html2text/'
+	),
+      array('MDB2/\\1',
+    	    'Mail/\\1',
+	    'html',
+	    'utf8.class',
+	    'lib/html2text'	// see #1485505
+	),
       $classname
   );
   include_once $filename. '.php';