summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-05-20 10:41:59 +0000
committeralecpl <alec@alec.pl>2010-05-20 10:41:59 +0000
commite93c72d9a378903502fa51452d6db3fffc3a9b28 (patch)
treea1c393bd81c8439cc6afcd153cda77766d802ce2
parentdc9d750e18bafb71776921ce6fac0c4e8bff994d (diff)
- remove html2text hack from autoloader (don't need it anymore)
-rwxr-xr-xprogram/include/iniset.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 3887fa5f3..6cbd55274 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -62,7 +62,7 @@ $include_path.= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
$include_path.= ini_get('include_path');
if (set_include_path($include_path) === false) {
- die('Fatal error: ini_set/set_include_path does not work.');
+ die("Fatal error: ini_set/set_include_path does not work.");
}
ini_set('error_reporting', E_ALL&~E_NOTICE);
@@ -74,7 +74,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
// set internal encoding for mbstring extension
if(extension_loaded('mbstring'))
mb_internal_encoding(RCMAIL_CHARSET);
-
+
/**
* Use PHP5 autoload for dynamic class loading
@@ -91,7 +91,6 @@ function rcube_autoload($classname)
'/Net_(.+)/',
'/^html_.+/',
'/^utf8$/',
- '/html2text/'
),
array(
'MDB2/\\1',
@@ -99,7 +98,6 @@ function rcube_autoload($classname)
'Net/\\1',
'html',
'utf8.class',
- 'lib/html2text' // see #1485505
),
$classname
);