https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115651

Revision: 115651
Author:   kipcool
Date:     2012-08-09 18:12:40 +0000 (Thu, 09 Aug 2012)
Log Message:
-----------
fix bug 38739

Modified Paths:
--------------
    trunk/extensions/Wikidata/OmegaWiki/OmegaWikiRecordSets.php

Modified: trunk/extensions/Wikidata/OmegaWiki/OmegaWikiRecordSets.php
===================================================================
--- trunk/extensions/Wikidata/OmegaWiki/OmegaWikiRecordSets.php 2012-08-09 
14:08:38 UTC (rev 115650)
+++ trunk/extensions/Wikidata/OmegaWiki/OmegaWikiRecordSets.php 2012-08-09 
18:12:40 UTC (rev 115651)
@@ -466,10 +466,18 @@
        } else {
                // default: is there an expression in the user language?
                $userLanguageId = getLanguageIdForCode( $wgLang->getCode() ) ;
-               $sql = $sqlbase . " AND language_id=" . $userLanguageId ;
-               $queryResult = $dbr->query( $sql );
+               $noResult = false ;
+               if ( $userLanguageId != "" ) {
+                       $sql = $sqlbase . " AND language_id=" . $userLanguageId 
;
+                       $queryResult = $dbr->query( $sql );
+                       if ( $dbr->numRows( $queryResult ) == 0 ) {
+                               $noResult = true ;
+                       }
+               } else {
+                       $noResult = true ;
+               }
 
-               if ( $dbr->numRows( $queryResult ) == 0 ) {
+               if ( $noResult ) {
                        // nothing in the user language, any language will do
                        $sql = $sqlbase . " LIMIT 1";
                        $queryResult = $dbr->query( $sql );


_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to