Revert the rest of r13645; totally broken, tries to call an installer-specific functi...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 540d8e2..00e9e8b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -68,8 +68,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   anchor identifiers
 * (bug 5519) Allow sidebar cache to be disabled; disable it by default.
 * Maintenance script to import the contents of a text file into a wiki page
-* installer: hide errors returned when trying to dl() mysql.so / pgsql.so
-* installer: cleanly outputbuffer when dieing out
 * Add $wgReservedUsernames configuration directive to block account creation/use
 * (bug 5576) Remove debugging hack in session check
 * (bug 5426) Lowercase treatment of titles in rights log leads to broken links on Special:Log

diff --git a/config/index.php b/config/index.php
index fd4959c..8bb6247 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -1309,8 +1309,7 @@ if ( \$wgCommandLineMode ) {
 }
 
 function dieout( $text ) {
-       outputFooter( $text );
-       die();
+       die( $text . "\n\n</body>\n</html>" );
 }
 
 function importVar( &$var, $name, $default = "" ) {

diff --git a/install-utils.inc b/install-utils.inc
index 1f5679d..9a8bab1 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -17,20 +17,15 @@ function install_version_checks() {
 
        $gotdatabase = 0;
        ## XXX We should quiet the warnings thrown here
-       if (extension_loaded('mysql') or @dl('mysql.so')) {
+       if (extension_loaded('mysql') or dl('mysql.so')) {
                $gotdatabase = 'mysql';
        }
-       else if (extension_loaded('pgsql') or @dl('pgsql.so')) {
+       else if (extension_loaded('pgsql') or dl('pgsql.so')) {
                $gotdatabase = 'pg';
        }
        if (!$gotdatabase) {
-               global $wgCommandLineMode;
-
-               $error ="Could not load the MySQL or the PostgreSQL driver! Please compile ".
-                         "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.<br/>\n".
-                         " If the database extension is installed (eg php-mysql), make sure it is enabled in your php.ini.\n";
-               if( $wgCommandLineMode ) { print $error; }
-               else { outputFooter($error); }
+               print "Could not load the MySQL or the PostgreSQL driver! Please compile ".
+                         "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.\n";
                exit;
        }
 
@@ -162,41 +157,4 @@ function field_info( $table, $field ) {
        return false;
 }
 
-/**
- * Used to end the HTML stream when we die out
- */
-function outputFooter( $text ) {
-print $text;
-print <<<END
-</div></div></div>
-
-
-<div id="column-one">
-    <div class="portlet" id="p-logo">
-      <a style="background-image: url(../skins/common/images/mediawiki.png);"
-        href="http://www.mediawiki.org/"
-        title="Main Page"></a>
-    </div>
-    <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
-    <div class='portlet'><div class='pBody'>
-        <ul>
-            <li><strong><a href="http://www.mediawiki.org/">MediaWiki home</a></strong></li>
-            <li><a href="../README">Readme</a></li>
-            <li><a href="../RELEASE-NOTES">Release notes</a></li>
-            <li><a href="../docs/">Documentation</a></li>
-            <li><a href="http://meta.wikipedia.org/wiki/MediaWiki_User's_Guide">User's Guide</a></li>
-            <li><a href="http://meta.wikimedia.org/wiki/MediaWiki_FAQ">FAQ</a></li>
-        </ul>
-        <p style="font-size:90%;margin-top:1em">MediaWiki is Copyright &copy; 2001-2006 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik M&ouml;ller, Gabriel Wicke and others.</p>
-    </div></div>
-</div>
-
-</div>
-
-</body>
-</html>
-
-END;
-
-}
 ?>