- support PEAR::Net_* in __autoload()

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

2 files changed, 2 insertions, 4 deletions

diff --git a/roundcubemail/program/include/iniset.php b/roundcubemail/program/include/iniset.php
index 4b8798526..8905161d2 100755
--- a/roundcubemail/program/include/iniset.php
+++ b/roundcubemail/program/include/iniset.php
@@ -83,12 +83,14 @@ function __autoload($classname)
   $filename = preg_replace(
       array('/MDB2_(.+)/',
     	    '/Mail_(.+)/',
+    	    '/Net_(.+)/',
 	    '/^html_.+/',
 	    '/^utf8$/',
 	    '/html2text/'
 	),
       array('MDB2/\\1',
     	    'Mail/\\1',
+    	    'Net/\\1',
 	    'html',
 	    'utf8.class',
 	    'lib/html2text'	// see #1485505
diff --git a/roundcubemail/program/include/rcube_smtp.inc b/roundcubemail/program/include/rcube_smtp.inc
index 77195e96f..ef84b031f 100644
--- a/roundcubemail/program/include/rcube_smtp.inc
+++ b/roundcubemail/program/include/rcube_smtp.inc
@@ -25,10 +25,6 @@
  * @package Mail
  */
 
-// include required PEAR classes
-require_once('Net/SMTP.php');
-
-
 // define headers delimiter
 define('SMTP_MIME_CRLF', "\r\n");