Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/206075
Change subject: Remove the "normalizeItemByTitlePageNames" setting ...................................................................... Remove the "normalizeItemByTitlePageNames" setting Only the the ItemByTitle special page respected it anyway and the right way to implement such a setting would be in MediaWiki directly. Change-Id: I7169826dc864ee30c0b3e6d5abc2518999531778 --- M repo/config/Wikibase.default.php M repo/config/Wikibase.example.php M repo/includes/specials/SpecialItemByTitle.php M repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php 4 files changed, 1 insertion(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/75/206075/1 diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php index 8f851b5..5722fd3 100644 --- a/repo/config/Wikibase.default.php +++ b/repo/config/Wikibase.default.php @@ -40,9 +40,6 @@ 'length' => 250, // length constraint ), - // Should the page names (titles) be normalized against the external site - 'normalizeItemByTitlePageNames' => true, - // Items allowed to be used as badges pointing to their CSS class names 'badgeItems' => array(), diff --git a/repo/config/Wikibase.example.php b/repo/config/Wikibase.example.php index 9cbac77..c9bfa9c 100644 --- a/repo/config/Wikibase.example.php +++ b/repo/config/Wikibase.example.php @@ -48,8 +48,6 @@ // Tell MediaWIki to search the item namespace $wgNamespacesToBeSearchedDefault[WB_NS_ITEM] = true; - $wgWBRepoSettings['normalizeItemByTitlePageNames'] = true; - // the special group includes all the sites in the specialSiteLinkGroups, // grouped together in a 'Pages linked to other sites' section. $wgWBRepoSettings['siteLinkGroups'] = array( diff --git a/repo/includes/specials/SpecialItemByTitle.php b/repo/includes/specials/SpecialItemByTitle.php index dac98ac..76835d7 100644 --- a/repo/includes/specials/SpecialItemByTitle.php +++ b/repo/includes/specials/SpecialItemByTitle.php @@ -37,11 +37,6 @@ private $siteLinkLookup; /** - * @var bool - */ - private $normalizeItemByTitlePageNames; - - /** * site link groups * * @var string[] @@ -60,7 +55,6 @@ $settings = WikibaseRepo::getDefaultInstance()->getSettings(); $this->initSettings( - $settings->getSetting( 'normalizeItemByTitlePageNames' ), $settings->getSetting( 'siteLinkGroups' ) ); @@ -75,14 +69,11 @@ * Initialize essential settings for this special page. * may be used by unit tests to override global settings. * - * @param bool $normalizeItemByTitlePageNames * @param string[] $siteLinkGroups */ public function initSettings( - $normalizeItemByTitlePageNames, array $siteLinkGroups ) { - $this->normalizeItemByTitlePageNames = $normalizeItemByTitlePageNames; $this->groups = $siteLinkGroups; } @@ -142,7 +133,7 @@ $itemId = $this->siteLinkLookup->getItemIdForLink( $siteId, $pageName ); // Do we have an item content, and if not can we try harder? - if ( $itemId === null && $this->normalizeItemByTitlePageNames === true ) { + if ( $itemId === null ) { // Try harder by requesting normalization on the external site $siteObj = $this->sites->getSite( $siteId ); if ( $siteObj instanceof Site ) { diff --git a/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php b/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php index 59580ca..e218b2c 100644 --- a/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php +++ b/repo/tests/phpunit/includes/specials/SpecialItemByTitleTest.php @@ -95,7 +95,6 @@ $page = new SpecialItemByTitle(); $page->initSettings( - true, array( 'wikipedia' ) ); -- To view, visit https://gerrit.wikimedia.org/r/206075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7169826dc864ee30c0b3e6d5abc2518999531778 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man <h...@online.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits