Merge branch 'main' into add-visualeditor-ext

wbstack · Nov 14, 2024 · df0103b · df0103b
2 parents c8fbad5 + 28a061b
commit df0103b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 Tags have the format: `<MediaWiki core version>-<PHP Version>-<date>-<build number>`
 
+## 1.39-7.4-20241112-0
+- Fix lexeme data transclusion returns 'nil' (#456)
+
 ## 1.39-7.4-20241107-0
 - Remove Graph extension (#453)
 

diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -602,6 +602,7 @@ function onSkinTemplateNavigationUniversal( SkinTemplate $skin, array &$links )
     $wgLexemeEnableDataTransclusion = true;
 
     $wgWBRepoSettings['entitySources']['local']['entityNamespaces']['lexeme'] = '146/main';
+    $wgWBClientSettings['entitySources']['local']['entityNamespaces']['lexeme'] = '146/main';
 }
 # Federated Properties, By default not enabled, not enabled in maint mode
 if( $wikiInfo->getSetting('wikibaseFedPropsEnable') ) {

diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
@@ -602,6 +602,7 @@ function onSkinTemplateNavigationUniversal( SkinTemplate $skin, array &$links )
     $wgLexemeEnableDataTransclusion = true;
 
     $wgWBRepoSettings['entitySources']['local']['entityNamespaces']['lexeme'] = '146/main';
+    $wgWBClientSettings['entitySources']['local']['entityNamespaces']['lexeme'] = '146/main';
 }
 # Federated Properties, By default not enabled, not enabled in maint mode
 if( $wikiInfo->getSetting('wikibaseFedPropsEnable') ) {