dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cef46d0
bc59c4f
)
Merge "ForeignAPIRepo: Fetch thumb error from foreign repo"
author
TheDJ
<hartman.wiki@gmail.com>
Sun, 19 May 2013 13:20:17 +0000
(13:20 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Sun, 19 May 2013 13:20:17 +0000
(13:20 +0000)
1
2
includes/filerepo/ForeignAPIRepo.php
patch
|
diff1
|
diff2
|
blob
|
history
includes/filerepo/file/ForeignAPIFile.php
patch
|
diff1
|
diff2
|
blob
|
history
languages/messages/MessagesEn.php
patch
|
diff1
|
diff2
|
blob
|
history
languages/messages/MessagesQqq.php
patch
|
diff1
|
diff2
|
blob
|
history
maintenance/language/messages.inc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
includes/filerepo/ForeignAPIRepo.php
index
5cd6fc2
,
85d3e7e
..
6b0bc3a
---
1
/
includes/filerepo/ForeignAPIRepo.php
---
2
/
includes/filerepo/ForeignAPIRepo.php
+++ b/
includes/filerepo/ForeignAPIRepo.php
@@@
-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 {
diff --cc
includes/filerepo/file/ForeignAPIFile.php
Simple merge
diff --cc
languages/messages/MessagesEn.php
Simple merge
diff --cc
languages/messages/MessagesQqq.php
Simple merge
diff --cc
maintenance/language/messages.inc
Simple merge