BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268147

Change subject: Wikibase: Defer modifying wgMFQueryPropModules until 
wfLoadExtensions runs
......................................................................

Wikibase: Defer modifying wgMFQueryPropModules until wfLoadExtensions runs

MobileFrontend has switched to using extension.json as it's entry point
which means that the default configuration it defines is not in scope at
the point which CommonSettings runs.

Change-Id: Ic08d1f83031f3324040bd395d64d624c71c0b8b9
---
M wmf-config/Wikibase.php
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/47/268147/1

diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index 197b734..0947d87 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -117,9 +117,13 @@
                1805, // (OBSOLETE) World Health Organisation International 
Nonproprietary Name (use P2275)
        );
 
-       if ( !in_array( 'pageterms', $wgMFQueryPropModules ) ) {
-               $wgMFQueryPropModules[] = 'pageterms';
-       }
+       // Needs to be deferred until after wfLoadExtensions() has run
+       $wgExtensionFunctions[] = function () {
+               global $wgMFQueryPropModules;
+               if ( !in_array( 'pageterms', $wgMFQueryPropModules ) ) {
+                       $wgMFQueryPropModules[] = 'pageterms';
+               }
+       };
 
        $wgMFSearchAPIParams['wbptterms'] = array( 'label' );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic08d1f83031f3324040bd395d64d624c71c0b8b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>

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

Reply via email to