| Index: trunk/phase3/config/index.php |
| — | — | @@ -1309,8 +1309,7 @@ |
| 1310 | 1310 | } |
| 1311 | 1311 | |
| 1312 | 1312 | function dieout( $text ) { |
| 1313 | | - outputFooter( $text ); |
| 1314 | | - die(); |
| | 1313 | + die( $text . "\n\n</body>\n</html>" ); |
| 1315 | 1314 | } |
| 1316 | 1315 | |
| 1317 | 1316 | function importVar( &$var, $name, $default = "" ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -68,8 +68,6 @@ |
| 69 | 69 | anchor identifiers |
| 70 | 70 | * (bug 5519) Allow sidebar cache to be disabled; disable it by default. |
| 71 | 71 | * Maintenance script to import the contents of a text file into a wiki page |
| 72 | | -* installer: hide errors returned when trying to dl() mysql.so / pgsql.so |
| 73 | | -* installer: cleanly outputbuffer when dieing out |
| 74 | 72 | * Add $wgReservedUsernames configuration directive to block account creation/use |
| 75 | 73 | * (bug 5576) Remove debugging hack in session check |
| 76 | 74 | * (bug 5426) Lowercase treatment of titles in rights log leads to broken links on Special:Log |
| Index: trunk/phase3/install-utils.inc |
| — | — | @@ -17,20 +17,15 @@ |
| 18 | 18 | |
| 19 | 19 | $gotdatabase = 0; |
| 20 | 20 | ## XXX We should quiet the warnings thrown here |
| 21 | | - if (extension_loaded('mysql') or @dl('mysql.so')) { |
| | 21 | + if (extension_loaded('mysql') or dl('mysql.so')) { |
| 22 | 22 | $gotdatabase = 'mysql'; |
| 23 | 23 | } |
| 24 | | - else if (extension_loaded('pgsql') or @dl('pgsql.so')) { |
| | 24 | + else if (extension_loaded('pgsql') or dl('pgsql.so')) { |
| 25 | 25 | $gotdatabase = 'pg'; |
| 26 | 26 | } |
| 27 | 27 | if (!$gotdatabase) { |
| 28 | | - global $wgCommandLineMode; |
| 29 | | - |
| 30 | | - $error ="Could not load the MySQL or the PostgreSQL driver! Please compile ". |
| 31 | | - "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.<br/>\n". |
| 32 | | - " If the database extension is installed (eg php-mysql), make sure it is enabled in your php.ini.\n"; |
| 33 | | - if( $wgCommandLineMode ) { print $error; } |
| 34 | | - else { outputFooter($error); } |
| | 28 | + print "Could not load the MySQL or the PostgreSQL driver! Please compile ". |
| | 29 | + "php with either --with-mysql or --with-pgsql, or install the mysql.so or pg.so module.\n"; |
| 35 | 30 | exit; |
| 36 | 31 | } |
| 37 | 32 | |
| — | — | @@ -162,41 +157,4 @@ |
| 163 | 158 | return false; |
| 164 | 159 | } |
| 165 | 160 | |
| 166 | | -/** |
| 167 | | - * Used to end the HTML stream when we die out |
| 168 | | - */ |
| 169 | | -function outputFooter( $text ) { |
| 170 | | -print $text; |
| 171 | | -print <<<END |
| 172 | | -</div></div></div> |
| 173 | | - |
| 174 | | - |
| 175 | | -<div id="column-one"> |
| 176 | | - <div class="portlet" id="p-logo"> |
| 177 | | - <a style="background-image: url(../skins/common/images/mediawiki.png);" |
| 178 | | - href="http://www.mediawiki.org/" |
| 179 | | - title="Main Page"></a> |
| 180 | | - </div> |
| 181 | | - <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script> |
| 182 | | - <div class='portlet'><div class='pBody'> |
| 183 | | - <ul> |
| 184 | | - <li><strong><a href="http://www.mediawiki.org/">MediaWiki home</a></strong></li> |
| 185 | | - <li><a href="../README">Readme</a></li> |
| 186 | | - <li><a href="../RELEASE-NOTES">Release notes</a></li> |
| 187 | | - <li><a href="../docs/">Documentation</a></li> |
| 188 | | - <li><a href="http://meta.wikipedia.org/wiki/MediaWiki_User's_Guide">User's Guide</a></li> |
| 189 | | - <li><a href="http://meta.wikimedia.org/wiki/MediaWiki_FAQ">FAQ</a></li> |
| 190 | | - </ul> |
| 191 | | - <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> |
| 192 | | - </div></div> |
| 193 | | -</div> |
| 194 | | - |
| 195 | | -</div> |
| 196 | | - |
| 197 | | -</body> |
| 198 | | -</html> |
| 199 | | - |
| 200 | | -END; |
| 201 | | - |
| 202 | | -} |
| 203 | 161 | ?> |