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: show realpath when asking to chmod g+w ./config
+* installer: hide errors returned when trying to dl() mysql.so / pgsql.so
+* installer: cleanly outputbuffer when dieing out
== Compatibility ==
<p>To make the directory writable on a Unix/Linux system:</p>
<pre>
- cd <i>/path/to/wiki</i>
+ cd <i>$IP</i>
chmod a+w config
</pre>" );
}
}
function dieout( $text ) {
- die( $text . "\n\n</body>\n</html>" );
+ outputFooter( $text );
+ die();
}
function importVar( &$var, $name, $default = "" ) {
$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) {
- 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";
+ 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); }
exit;
}
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 © 2001-2006 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke and others.</p>
+ </div></div>
+</div>
+
+</div>
+
+</body>
+</html>
+
+END;
+
+}
?>