[Svn] r1986 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Sat Oct 18 11:57:09 CEST 2008


Author: alec
Date: 2008-10-18 04:57:08 -0500 (Sat, 18 Oct 2008)
New Revision: 1986

Modified:
   trunk/roundcubemail/program/include/iniset.php
Log:
#1485505: PHP bug (?) workaround for html2text class autoloading


Modified: trunk/roundcubemail/program/include/iniset.php
===================================================================
--- trunk/roundcubemail/program/include/iniset.php	2008-10-18 07:01:37 UTC (rev 1985)
+++ trunk/roundcubemail/program/include/iniset.php	2008-10-18 09:57:08 UTC (rev 1986)
@@ -75,8 +75,18 @@
 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';

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list