Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346496 )

Change subject: Replace Interwiki::selectFields() with the supported equivalent 
in 1.28+
......................................................................

Replace Interwiki::selectFields() with the supported equivalent in 1.28+

Keep compat with 1.27.

This change was caused by 
https://github.com/wikimedia/mediawiki/commit/025f15a208a75de47a71d3d8515e4b2b975fae1d

Fixed with alot of help from @Reedy

Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
---
M InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
1 file changed, 14 insertions(+), 10 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/96/346496/1

diff --git a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php 
b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
index effdc17..c58fad7 100644
--- a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
+++ b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php
@@ -311,17 +311,21 @@
                if ( isset( $this->aIWLexists[$sPrefix] ) ) {
                        return $this->aIWLexists[$sPrefix];
                }
-               $row = $this->getDB()->selectRow(
-                       'interwiki',
-                       Interwiki::selectFields(),
-                       [ 'iw_prefix' => $sPrefix ],
-                       __METHOD__
-               );
-
-               if( !$row ) {
-                       $this->aIWLexists[$sPrefix] = false;
+               if ( version_compare( $GLOBALS['wgVersion'], '1.28c', '>' ) ) {
+                       $this->aIWLexists[$sPrefix] = 
\MediaWiki\MediaWikiServices::getInstance()->getInterwikiLookup()->isValidInterwiki(
 $sPrefix );
                } else {
-                       $this->aIWLexists[$sPrefix] = true;
+                       $row = $this->getDB()->selectRow(
+                               'interwiki',
+                               Interwiki::selectFields(),
+                               [ 'iw_prefix' => $sPrefix ],
+                               __METHOD__
+                       );
+
+                       if( !$row ) {
+                               $this->aIWLexists[$sPrefix] = false;
+                       } else {
+                               $this->aIWLexists[$sPrefix] = true;
+                       }
                }
 
                return $this->aIWLexists[$sPrefix];

-- 
To view, visit https://gerrit.wikimedia.org/r/346496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I513052448c53191d077c7dc61775c1b4420da38c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>

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

Reply via email to