summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-06-20 13:19:11 +0000
committeralecpl <alec@alec.pl>2009-06-20 13:19:11 +0000
commit70306a4c75ddd70eb4886496df2bee63e0b09ac4 (patch)
tree6dea93aee71b2a8c4be11d264730dc6d9fda024c
parent35749f91d2c4131978d1ad283bef557c35ff5ae9 (diff)
- support PEAR::Net_* in __autoload()
-rwxr-xr-xprogram/include/iniset.php2
-rw-r--r--program/include/rcube_smtp.inc4
2 files changed, 2 insertions, 4 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 4b8798526..8905161d2 100755
--- a/program/include/iniset.php
+++ b/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/program/include/rcube_smtp.inc b/program/include/rcube_smtp.inc
index 77195e96f..ef84b031f 100644
--- a/program/include/rcube_smtp.inc
+++ b/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");