Aude has submitted this change and it was merged.

Change subject: (Bug 46466) Fix removed underscores in site id
......................................................................


(Bug 46466) Fix removed underscores in site id

A fix in ItemByTitle that should only strip underscores in "page"
also strips underscores in "site". That makes some language code
fail, and then the page lookup fail.

This is not properly tested yet.

Change-Id: I61acaeabdf44d80dde9b129c4de51e10e4004cd8
---
M repo/includes/specials/SpecialItemByTitle.php
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Aude: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/repo/includes/specials/SpecialItemByTitle.php 
b/repo/includes/specials/SpecialItemByTitle.php
index c085971..11d09c4 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -57,16 +57,14 @@
                $request = $this->getRequest();
                $parts = ( $subPage === '' ) ? array() : explode( '/', 
$subPage, 2 );
                $site = trim( $request->getVal( 'site', isset( $parts[0] ) ? 
$parts[0] : '' ) );
-               $site = str_replace( '_', ' ', $site );
                $page = trim( $request->getVal( 'page', isset( $parts[1] ) ? 
$parts[1] : '' ) );
-               $page = str_replace( '_', ' ', $page );
 
                $itemContent = null;
 
                // If ther are enough data, then try to lookup the item content
                if ( isset( $site ) && isset( $page ) ) {
                        // Try to get a item content
-                       $siteId = \Wikibase\Utils::trimToNFC( str_replace( '_', 
' ', $site ) );
+                       $siteId = \Wikibase\Utils::trimToNFC( $site ); // no 
stripping of underscores here!
                        $pageName = \Wikibase\Utils::trimToNFC( str_replace( 
'_', ' ', $page ) );
                        $itemHandler = new \Wikibase\ItemHandler();
                        $itemContent = $itemHandler->getFromSiteLink( $siteId, 
$pageName );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61acaeabdf44d80dde9b129c4de51e10e4004cd8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: John Erling Blad <john.b...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to