jenkins-bot has submitted this change and it was merged.
Change subject: Update missing.php for interwiki.php
......................................................................
Update missing.php for interwiki.php
Change-Id: Ib5407c560db94ee1042f378ae4ad28a9b5eb0c9f
---
M wmf-config/missing.php
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/missing.php b/wmf-config/missing.php
index f6a498b..904113c 100644
--- a/wmf-config/missing.php
+++ b/wmf-config/missing.php
@@ -23,9 +23,6 @@
require_once dirname( __DIR__ ) . '/multiversion/vendor/autoload.php';
-use Cdb\Exception as CdbException;
-use Cdb\Reader as CdbReader;
-
/**
* The main function
*/
@@ -75,18 +72,23 @@
# Open the interwiki file to see if we have an interwiki prefix
$db = null;
try {
- $db = CdbReader::open( __DIR__ . '/interwiki.cdb' );
- } catch ( CdbException $e ) {}
+ $db = include_once( __DIR__ . '/interwiki.php' );
+ } catch ( Exception $e ) {}
if ( $db ) {
$prefix = strtok( $page, ':' );
# Try looking for lateral links (w: q: voy: ...)
- $row = $db->get( "{$language}wiki:$prefix" );
+ $row = null;
+ if ( isset( $db[ "{$language}wiki:$prefix" ] ) ) {
+ $row = $db[ "{$language}wiki:$prefix" ];
+ }
if( !$row ) {
# Also try interlanguage links
- $projectForCdb = ( $project === 'wikipedia' ?
'wiki' : $project );
- $row = $db->get( "_$projectForCdb:$prefix" );
+ $projectKey = ( $project === 'wikipedia' ?
'wiki' : $project );
+ if ( isset( $db[ "_$projectKey:$prefix" ] ) ) {
+ $row = $db[ "_$projectKey:$prefix" ];
+ }
}
if( $row ) {
--
To view, visit https://gerrit.wikimedia.org/r/269301
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5407c560db94ee1042f378ae4ad28a9b5eb0c9f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
