summaryrefslogtreecommitdiff
path: root/installer/utils.php
diff options
context:
space:
mode:
Diffstat (limited to 'installer/utils.php')
-rw-r--r--installer/utils.php19
1 files changed, 3 insertions, 16 deletions
diff --git a/installer/utils.php b/installer/utils.php
index 54221dd2d..1c101058f 100644
--- a/installer/utils.php
+++ b/installer/utils.php
@@ -29,13 +29,13 @@
/**
* Use PHP5 autoload for dynamic class loading
- * (copy from program/incllude/iniset.php)
+ * (copy from program/include/iniset.php)
*/
function __autoload($classname)
{
$filename = preg_replace(
- array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
- array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+ array('/MDB2_(.+)/', '/Mail_(.+)/', '/Net_(.+)/', '/^html_.+/', '/^utf8$/'),
+ array('MDB2/\\1', 'Mail/\\1', 'Net/\\1', 'html', 'utf8.class'),
$classname
);
include_once $filename. '.php';
@@ -43,18 +43,6 @@ function __autoload($classname)
/**
- * Shortcut function for htmlentities()
- *
- * @param string String to quote
- * @return string The html-encoded string
- */
-function Q($string)
-{
- return htmlentities($string, ENT_COMPAT, 'UTF-8');
-}
-
-
-/**
* Fake internal error handler to catch errors
*/
function raise_error($p)
@@ -63,4 +51,3 @@ function raise_error($p)
$rci->raise_error($p);
}
-