Daniel Kinzler has submitted this change and it was merged.
Change subject: Remove underscores in SiteLinkLookup::getItemIdForLink
......................................................................
Remove underscores in SiteLinkLookup::getItemIdForLink
We don't store underscores like MediaWiki core does.
Change-Id: Ie1c0bb1ba3d84825d4b25d5e560ef3fe7bc6e6c6
---
M lib/includes/store/sql/SiteLinkTable.php
M lib/tests/phpunit/MockRepository.php
M repo/includes/specials/SpecialItemByTitle.php
3 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
Jeroen De Dauw: Looks good to me, but someone else must approve
jenkins-bot: Checked
diff --git a/lib/includes/store/sql/SiteLinkTable.php
b/lib/includes/store/sql/SiteLinkTable.php
index 9853e90..0b883c9 100644
--- a/lib/includes/store/sql/SiteLinkTable.php
+++ b/lib/includes/store/sql/SiteLinkTable.php
@@ -173,6 +173,9 @@
* @return integer|boolean
*/
public function getItemIdForLink( $globalSiteId, $pageTitle ) {
+ // We store page titles with spaces instead of underscores
+ $pageTitle = str_replace( '_', ' ', $pageTitle );
+
$db = $this->getConnection( DB_SLAVE );
$result = $db->selectRow(
diff --git a/lib/tests/phpunit/MockRepository.php
b/lib/tests/phpunit/MockRepository.php
index 9da3c2e..0394cad 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -138,6 +138,9 @@
* @return integer|boolean
*/
public function getItemIdForLink( $globalSiteId, $pageTitle ) {
+ // We store page titles with spaces instead of underscores
+ $pageTitle = str_replace( '_', ' ', $pageTitle );
+
$key = "$globalSiteId:$pageTitle";
if ( isset( $this->itemByLink[$key] ) ) {
diff --git a/repo/includes/specials/SpecialItemByTitle.php
b/repo/includes/specials/SpecialItemByTitle.php
index 11d09c4..831c5c1 100644
--- a/repo/includes/specials/SpecialItemByTitle.php
+++ b/repo/includes/specials/SpecialItemByTitle.php
@@ -65,7 +65,7 @@
if ( isset( $site ) && isset( $page ) ) {
// Try to get a item content
$siteId = \Wikibase\Utils::trimToNFC( $site ); // no
stripping of underscores here!
- $pageName = \Wikibase\Utils::trimToNFC( str_replace(
'_', ' ', $page ) );
+ $pageName = \Wikibase\Utils::trimToNFC( $page );
$itemHandler = new \Wikibase\ItemHandler();
$itemContent = $itemHandler->getFromSiteLink( $siteId,
$pageName );
// Do we have an item content, and if not can we try
harder?
--
To view, visit https://gerrit.wikimedia.org/r/60760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1c0bb1ba3d84825d4b25d5e560ef3fe7bc6e6c6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
