From 11526305f506245af55e8ae7ea31faec49dfd98d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 02 Mar 2009 12:34:18 -0500
Subject: [PATCH] Revert r2322; this is done in rcmail_html4inline() and now secured + fix tests
---
installer/check.php | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/installer/check.php b/installer/check.php
index a8a0125..4c34dd6 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,13 +1,13 @@
<form action="index.php" method="get">
<?php
-$required_php_exts = array('PCRE' => 'pcre', 'DOM' => 'dom2', 'Session' => 'session',);
+$required_php_exts = array('PCRE' => 'pcre', 'DOM' => 'dom', 'Session' => 'session');
$optional_php_exts = array('FileInfo' => 'fileinfo', 'Libiconv' => 'iconv',
'Multibyte' => 'mbstring', 'OpenSSL' => 'openssl', 'Mcrypt' => 'mcrypt',
'GD' => 'gd');
-$required_libs = array('PEAR' => 'PEAR.php', 'DB' => 'DB.php', 'MDB2' => 'MDB2.php',
+$required_libs = array('PEAR' => 'PEAR.php', 'MDB2' => 'MDB2.php',
'Net_SMTP' => 'Net/SMTP.php', 'Mail_mime' => 'Mail/mime.php',
'iilConnection' => 'lib/imap.inc');
@@ -15,7 +15,7 @@
'PostgreSQL' => 'pgsql', 'SQLite (v2)' => 'sqlite');
$ini_checks = array('file_uploads' => 1, 'session.auto_start' => 0,
- 'magic_quotes_gpc' => 0, 'magic_quotes_sybase' => 0);
+ 'zend.ze1_compatibility_mode' => 0, 'mbstring.func_overload' => 0);
$source_urls = array(
'Sockets' => 'http://www.php.net/manual/en/ref.sockets.php',
@@ -114,9 +114,6 @@
@include_once $file;
if (class_exists($classname)) {
$RCI->pass($classname);
- }
- else if ($classname == 'DB' || ($classname == 'MDB2' && class_exists('DB'))) {
- $RCI->na($classname, 'Use ' . ($classname == 'DB' ? 'MDB2' : 'DB') . ' instead');
}
else {
$RCI->fail($classname, "Failed to load $file", $source_urls[$classname]);
--
Gitblit v1.9.1