Jeroen De Dauw has submitted this change and it was merged.
Change subject: Remove usage of Wikibase\SiteLink in DiffView
......................................................................
Remove usage of Wikibase\SiteLink in DiffView
Change-Id: I9268f75b17d56b0853d2eb5ba48431d04e1dd21b
---
M repo/includes/DiffView.php
1 file changed, 19 insertions(+), 4 deletions(-)
Approvals:
WikidataJenkins: Verified
Jeroen De Dauw: Looks good to me, approved
diff --git a/repo/includes/DiffView.php b/repo/includes/DiffView.php
index 3ea72ea..4c98121 100644
--- a/repo/includes/DiffView.php
+++ b/repo/includes/DiffView.php
@@ -150,9 +150,10 @@
*/
protected function getDeletedLine( $value, $path ) {
if( $path[0] === $this->getLanguage()->getMessage(
'wikibase-diffview-link' ) ) {
- $siteLink = new SiteLink( $this->siteStore->getSite(
$path[1] ), $value );
+ $url = $this->getPageLink( $path[1], $value );
+
return Html::rawElement( 'del', array( 'class' =>
'diffchange diffchange-inline' ),
- Html::element( 'a', array( 'href' =>
$siteLink->getUrl() ), $value )
+ Html::element( 'a', array( 'href' => $url ),
$value )
);
} else {
return Html::element( 'del', array( 'class' =>
'diffchange diffchange-inline' ), $value );
@@ -166,9 +167,10 @@
*/
protected function getAddedLine( $value, $path ) {
if( $path[0] === $this->getLanguage()->getMessage(
'wikibase-diffview-link' ) ){
- $siteLink = new SiteLink( $this->siteStore->getSite(
$path[1] ), $value );
+ $url = $this->getPageLink( $path[1], $value );
+
return Html::rawElement( 'ins', array( 'class' =>
'diffchange diffchange-inline' ),
- Html::element( 'a', array( 'href' =>
$siteLink->getUrl() ), $value )
+ Html::element( 'a', array( 'href' => $url ),
$value )
);
} else {
return Html::element( 'ins', array( 'class' =>
'diffchange diffchange-inline' ), $value );
@@ -176,6 +178,19 @@
}
/**
+ * @param string $siteId
+ * @param string $pageName
+ *
+ * @return string
+ */
+ protected function getPageLink( $siteId, $pageName ) {
+ $site = $this->siteStore->getSite( $siteId );
+ $url = $site->getPageUrl( $pageName );
+
+ return $url;
+ }
+
+ /**
* Generates HTML for the header of the diff operation
*
* @since 0.4
--
To view, visit https://gerrit.wikimedia.org/r/123881
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9268f75b17d56b0853d2eb5ba48431d04e1dd21b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
