http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82879
Revision: 82879
Author: reedy
Date: 2011-02-27 00:29:21 +0000 (Sun, 27 Feb 2011)
Log Message:
-----------
Remove unreachable return
Swap "dieout" for "die" in DatabaseMssql
Modified Paths:
--------------
trunk/phase3/includes/Namespace.php
trunk/phase3/includes/db/DatabaseMssql.php
Modified: trunk/phase3/includes/Namespace.php
===================================================================
--- trunk/phase3/includes/Namespace.php 2011-02-26 23:47:41 UTC (rev 82878)
+++ trunk/phase3/includes/Namespace.php 2011-02-27 00:29:21 UTC (rev 82879)
@@ -64,7 +64,6 @@
private static function isMethodValidFor( $index, $method ) {
if( $index < NS_MAIN ) {
throw new MWException( "$method does not make any sense
for given namespace $index" );
- return false;
}
return true;
}
Modified: trunk/phase3/includes/db/DatabaseMssql.php
===================================================================
--- trunk/phase3/includes/db/DatabaseMssql.php 2011-02-26 23:47:41 UTC (rev
82878)
+++ trunk/phase3/includes/db/DatabaseMssql.php 2011-02-27 00:29:21 UTC (rev
82879)
@@ -820,20 +820,20 @@
$res = $this->doQuery( $SQL );
if ( !$res ) {
print "<b>FAILED</b>. Make sure that the user " .
htmlspecialchars( $wgDBuser ) . " can write to the database</li>\n";
- dieout( );
+ die();
}
$this->doQuery( "DROP TABLE $ctest" );
$res = $this->sourceFile( "../maintenance/mssql/tables.sql" );
if ( $res !== true ) {
echo " <b>FAILED</b></li>";
- dieout( htmlspecialchars( $res ) );
+ die( htmlspecialchars( $res ) );
}
# Avoid the non-standard "REPLACE INTO" syntax
$f = fopen( "../maintenance/interwiki.sql", 'r' );
if ( $f == false ) {
- dieout( "<li>Could not find the interwiki.sql file" );
+ die( "<li>Could not find the interwiki.sql file" );
}
# We simply assume it is already empty as we have just created
it
$SQL = "INSERT INTO interwiki(iw_prefix,iw_url,iw_local) VALUES
";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
