| Index: trunk/phase3/includes/db/DatabaseMssql.php |
| — | — | @@ -820,20 +820,20 @@ |
| 821 | 821 | $res = $this->doQuery( $SQL ); |
| 822 | 822 | if ( !$res ) { |
| 823 | 823 | print "<b>FAILED</b>. Make sure that the user " . htmlspecialchars( $wgDBuser ) . " can write to the database</li>\n"; |
| 824 | | - dieout( ); |
| | 824 | + die(); |
| 825 | 825 | } |
| 826 | 826 | $this->doQuery( "DROP TABLE $ctest" ); |
| 827 | 827 | |
| 828 | 828 | $res = $this->sourceFile( "../maintenance/mssql/tables.sql" ); |
| 829 | 829 | if ( $res !== true ) { |
| 830 | 830 | echo " <b>FAILED</b></li>"; |
| 831 | | - dieout( htmlspecialchars( $res ) ); |
| | 831 | + die( htmlspecialchars( $res ) ); |
| 832 | 832 | } |
| 833 | 833 | |
| 834 | 834 | # Avoid the non-standard "REPLACE INTO" syntax |
| 835 | 835 | $f = fopen( "../maintenance/interwiki.sql", 'r' ); |
| 836 | 836 | if ( $f == false ) { |
| 837 | | - dieout( "<li>Could not find the interwiki.sql file" ); |
| | 837 | + die( "<li>Could not find the interwiki.sql file" ); |
| 838 | 838 | } |
| 839 | 839 | # We simply assume it is already empty as we have just created it |
| 840 | 840 | $SQL = "INSERT INTO interwiki(iw_prefix,iw_url,iw_local) VALUES "; |
| Index: trunk/phase3/includes/Namespace.php |
| — | — | @@ -64,7 +64,6 @@ |
| 65 | 65 | private static function isMethodValidFor( $index, $method ) { |
| 66 | 66 | if( $index < NS_MAIN ) { |
| 67 | 67 | throw new MWException( "$method does not make any sense for given namespace $index" ); |
| 68 | | - return false; |
| 69 | 68 | } |
| 70 | 69 | return true; |
| 71 | 70 | } |