jenkins-bot has submitted this change and it was merged.

Change subject: Correctly construct edit-links to SpecialPages in EntityView
......................................................................


Correctly construct edit-links to SpecialPages in EntityView

Bug: 50890
Change-Id: If59fd705eb8b9ed7fb2954c34f7013235ab428d1
---
M repo/includes/EntityView.php
1 file changed, 6 insertions(+), 5 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, but someone else must approve
  WikidataJenkins: Verified
  Thiemo Mättig (WMDE): Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/EntityView.php b/repo/includes/EntityView.php
index 418ce84..be02a8d 100644
--- a/repo/includes/EntityView.php
+++ b/repo/includes/EntityView.php
@@ -611,14 +611,15 @@
                }
 
                if ( $entity->getId() ) {
-                       $id = $this->getFormattedIdForEntity( $entity );
+                       $subpage = $this->getFormattedIdForEntity( $entity );
                } else {
-                       $id = ''; // can't skip this, that would confuse the 
order of parameters!
+                       $subpage = ''; // can't skip this, that would confuse 
the order of parameters!
                }
 
-               return $specialpage->getPageTitle()->getLocalURL()
-                               . '/' . wfUrlencode( $id )
-                               . ( $lang === null ? '' : '/' . wfUrlencode( 
$lang->getCode() ) );
+               if ( $lang !== null ) {
+                       $subpage .= '/' . $lang->getCode();
+               }
+               return $specialpage->getPageTitle( $subpage )->getLocalURL();
        }
 
        /**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If59fd705eb8b9ed7fb2954c34f7013235ab428d1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
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

Reply via email to