Yaron Koren has uploaded a new change for review.

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

Change subject: Fix for fa49360 - array_merge() destroys numeric array keys
......................................................................

Fix for fa49360 - array_merge() destroys numeric array keys

Change-Id: Ia801bc007d05bc936781c489c2c03aacb5a5d556
---
M SemanticDrilldown.php
1 file changed, 6 insertions(+), 10 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticDrilldown 
refs/changes/47/271547/1

diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php
index c80ed01..42f86ee 100644
--- a/SemanticDrilldown.php
+++ b/SemanticDrilldown.php
@@ -13,7 +13,7 @@
 
 // Ensure that the script cannot be executed outside of MediaWiki
 if ( !defined( 'MEDIAWIKI' ) ) {
-    die( 'This is an extension to MediaWiki and cannot be run standalone.' );
+       die( 'This is an extension to MediaWiki and cannot be run standalone.' 
);
 }
 
 // Define extension's version
@@ -136,16 +136,12 @@
        $wgExtraNamespaces = $wgExtraNamespaces + $sdgContLang->getNamespaces();
        $wgNamespaceAliases = $wgNamespaceAliases + 
$sdgContLang->getNamespaceAliases();
 
-       // Support subpages only for talk pages by default
-       $wgNamespacesWithSubpages = array_merge( $wgNamespacesWithSubpages, 
array(
-               SD_NS_FILTER_TALK => true
-       ) );
+       // Support subpages only for talk pages by default.
+       $wgNamespacesWithSubpages[SD_NS_FILTER_TALK] = true;
 
-       // Enable semantic links on filter pages
-       $smwgNamespacesWithSemanticLinks = array_merge( 
$smwgNamespacesWithSemanticLinks, array(
-               SD_NS_FILTER => true,
-               SD_NS_FILTER_TALK => false
-       ) );
+       // Enable semantic links on filter pages.
+       $smwgNamespacesWithSemanticLinks[SD_NS_FILTER] = true;
+       $smwgNamespacesWithSemanticLinks[SD_NS_FILTER_TALK] = false;
 }
 
 /**********************************************/

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia801bc007d05bc936781c489c2c03aacb5a5d556
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticDrilldown
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <[email protected]>

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

Reply via email to