Ori.livneh has submitted this change and it was merged.
Change subject: Fix-up for I5a979f047031e
......................................................................
Fix-up for I5a979f047031e
Apply the same if-$db-then-cdb-else-static-array logic from I5a979f047031e
to Interwiki::getAllPrefixesCached().
Change-Id: I003e055471747afdcc82440490456e03cc67cc1a
---
M includes/interwiki/Interwiki.php
1 file changed, 20 insertions(+), 4 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/includes/interwiki/Interwiki.php b/includes/interwiki/Interwiki.php
index be16bcf..6878f33 100644
--- a/includes/interwiki/Interwiki.php
+++ b/includes/interwiki/Interwiki.php
@@ -288,11 +288,17 @@
$data = array();
try {
if ( !$db ) {
- $db = CdbReader::open( $wgInterwikiCache );
+ $db = is_array( $wgInterwikiCache ) ? false :
CdbReader::open( $wgInterwikiCache );
}
/* Resolve site name */
if ( $wgInterwikiScopes >= 3 && !$site ) {
- $site = $db->get( '__sites:' . wfWikiID() );
+ $key = '__sites:' . wfWikiID();
+ if ( $db ) {
+ $site = $db->get( $key );
+ } else {
+ $site = isset( $wgInterwikiCache[ $key
] ) ? $wgInterwikiCache[$key] : false;
+ }
+
if ( $site == '' ) {
$site = $wgInterwikiFallbackSite;
}
@@ -311,9 +317,19 @@
$sources[] = wfWikiID();
foreach ( $sources as $source ) {
- $list = $db->get( "__list:{$source}" );
+ $key = "__list:{$source}";
+ if ( $db ) {
+ $list = $db->get( $key );
+ } else {
+ $list = isset( $wgInterwikiCache[$key]
) ? $wgInterwikiCache[$key] : false;
+ }
foreach ( explode( ' ', $list ) as $iw_prefix )
{
- $row = $db->get(
"{$source}:{$iw_prefix}" );
+ $key = "{$source}:{$iw_prefix}";
+ if ( $db ) {
+ $row = $db->get( $key );
+ } else {
+ $row = isset(
$wgInterwikiCache[$key] ) ? $wgInterwikiCache[$key] : false;
+ }
if ( !$row ) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/269330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I003e055471747afdcc82440490456e03cc67cc1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.12
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: TTO <at.li...@live.com.au>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
