Merge "ForeignAPIRepo: Fetch thumb error from foreign repo"
authorTheDJ <hartman.wiki@gmail.com>
Sun, 19 May 2013 13:20:17 +0000 (13:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 19 May 2013 13:20:17 +0000 (13:20 +0000)
1  2 
includes/filerepo/ForeignAPIRepo.php
includes/filerepo/file/ForeignAPIFile.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/language/messages.inc

@@@ -147,10 -147,13 +147,13 @@@ class ForeignAPIRepo extends FileRepo 
  
                $query = array_merge( $query,
                        array(
 -                              'format'    => 'json',
 -                              'action'    => 'query',
 +                              'format' => 'json',
 +                              'action' => 'query',
                                'redirects' => 'true'
                        ) );
+               if ( !isset( $query['uselang'] ) ) { // uselang is unset or null
+                       $query['uselang'] = $wgLanguageCode;
+               }
                if ( $this->mApiBase ) {
                        $url = wfAppendQuery( $this->mApiBase, $query );
                } else {
Simple merge
Simple merge
Simple merge