[MediaWiki-commits] [Gerrit] Fix Fatal error: Invalid operand type was used, Remove $wgPa... - change (mediawiki...SemanticDrilldown)

[Hashar (Code Review)]

Hashar has submitted this change and it was merged.

Change subject: Fix Fatal error: Invalid operand type was used, Remove 
$wgPageProps removed config
......................................................................


Fix Fatal error: Invalid operand type was used, Remove $wgPageProps removed 
config

Add missing class SDBrowseDataPage to autoloader.

Spotted here
https://integration.wikimedia.org/ci/job/mwext-testextension-hhvm/960/console

While attempting to upgrade to 1.26.2 (French message)
https://lists.wikimedia.org/pipermail/mediawiki-l/2016-February/045369.html

Change-Id: I3b2506b1fa801cb379d935394243b74836ba8cd9
(cherry picked from commit fa493601388291ff4490fbb72eeaf1e4d37ee30b)
---
M SemanticDrilldown.php
1 file changed, 14 insertions(+), 11 deletions(-)

Approvals:
  Hashar: Verified; Looks good to me, approved



diff --git a/SemanticDrilldown.php b/SemanticDrilldown.php
index 604b460..fc1181e 100644
--- a/SemanticDrilldown.php
+++ b/SemanticDrilldown.php
@@ -46,9 +46,8 @@
 $wgExtensionMessagesFiles['SemanticDrilldownAlias'] = $sdgIP . 
'/languages/SD_Aliases.php';
 $wgExtensionMessagesFiles['SemanticDrilldownMagic'] = $sdgIP . 
'/languages/SemanticDrilldown.i18n.magic.php';
 
-// register all special pages and other classes
-$wgSpecialPages['BrowseData'] = 'SDBrowseData';
 $wgAutoloadClasses['SDBrowseData'] = $sdgIP . '/specials/SD_BrowseData.php';
+$wgAutoloadClasses['SDBrowseDataPage'] = $sdgIP . 
'/specials/SD_BrowseData.php';
 
 $wgAutoloadClasses['SDUtils'] = $sdgIP . '/includes/SD_Utils.php';
 $wgAutoloadClasses['SDFilter'] = $sdgIP . '/includes/SD_Filter.php';
@@ -57,6 +56,9 @@
 $wgAutoloadClasses['SDPageSchemas'] = $sdgIP . '/includes/SD_PageSchemas.php';
 $wgAutoloadClasses['SDParserFunctions'] = $sdgIP . 
'/includes/SD_ParserFunctions.php';
 
+// register all special pages and other classes
+$wgSpecialPages['BrowseData'] = 'SDBrowseData';
+
 $wgHooks['smwInitProperties'][] = 'sdfInitProperties';
 $wgHooks['AdminLinks'][] = 'SDUtils::addToAdminLinks';
 $wgHooks['MagicWordwgVariableIDs'][] = 'SDUtils::addMagicWordVariableIDs';
@@ -64,9 +66,6 @@
 $wgHooks['ParserBeforeTidy'][] = 'SDUtils::handleShowAndHide';
 $wgHooks['PageSchemasRegisterHandlers'][] = 'SDPageSchemas::registerClass';
 $wgHooks['ParserFirstCallInit'][] = 'SDParserFunctions::registerFunctions';
-
-$wgPageProps['hidefromdrilldown'] = 'Whether or not the page is set as 
HIDEFROMDRILLDOWN';
-$wgPageProps['showindrilldown'] = 'Whether or not the page is set as 
SHOWINDRILLDOWN';
 
 # ##
 # This is the path to your installation of Semantic Drilldown as
@@ -132,15 +131,15 @@
        $wgNamespaceAliases = $wgNamespaceAliases + 
$sdgContLang->getNamespaceAliases();
 
        // Support subpages only for talk pages by default
-       $wgNamespacesWithSubpages = $wgNamespacesWithSubpages + array(
+       $wgNamespacesWithSubpages = array_merge( $wgNamespacesWithSubpages, 
array(
                SD_NS_FILTER_TALK => true
-       );
+       ) );
 
        // Enable semantic links on filter pages
-       $smwgNamespacesWithSemanticLinks = $smwgNamespacesWithSemanticLinks + 
array(
+       $smwgNamespacesWithSemanticLinks = array_merge( 
$smwgNamespacesWithSemanticLinks, array(
                SD_NS_FILTER => true,
                SD_NS_FILTER_TALK => false
-       );
+       ) );
 }
 
 /**********************************************/
@@ -156,7 +155,9 @@
 function sdfInitContentLanguage( $langcode ) {
        global $sdgIP, $sdgContLang;
 
-       if ( !empty( $sdgContLang ) ) { return; }
+       if ( !empty( $sdgContLang ) ) {
+               return;
+       }
 
        $sdContLangClass = 'SD_Language' . str_replace( '-', '_', ucfirst( 
$langcode ) );
 
@@ -181,7 +182,9 @@
 function sdfInitUserLanguage( $langcode ) {
        global $sdgIP, $sdgLang;
 
-       if ( !empty( $sdgLang ) ) { return; }
+       if ( !empty( $sdgLang ) ) {
+               return;
+       }
 
        $sdLangClass = 'SD_Language' . str_replace( '-', '_', ucfirst( 
$langcode ) );
        if ( file_exists( $sdgIP . '/languages/' . $sdLangClass . '.php' ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b2506b1fa801cb379d935394243b74836ba8cd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticDrilldown
Gerrit-Branch: REL1_26
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits