Various fixes, see the version of [[m:Development status]] before this commit for...

[lhc/web/wiklou.git] / includes / DatabaseFunctions.php

diff --git a/includes/DatabaseFunctions.php b/includes/DatabaseFunctions.php
index cdee256..2d74af4 100644 (file)
--- a/includes/DatabaseFunctions.php
+++ b/includes/DatabaseFunctions.php
@@ -97,6 +97,12 @@ function wfQuery( $sql, $db, $fname = "" )
 {
        global $wgLastDatabaseQuery, $wgOut;
 ##     wfProfileIn( "wfQuery" );
+
+       if ( !is_numeric( $db ) ) {
+               # Someone has tried to call this the old way
+               $wgOut->fatalError( wfMsgNoDB( "wrong_wfQuery_params" ) );
+       }
+       
        $wgLastDatabaseQuery = $sql;
        $conn = wfGetDB();
        $ret = mysql_query( $sql, $conn );