jenkins-bot has submitted this change and it was merged.
Change subject: (bug 52193) Pass back siteid for conflicting links
......................................................................
(bug 52193) Pass back siteid for conflicting links
Change-Id: I0d8ae757e41b55113ee3f93a3238223ddbd5e9bb
---
M repo/includes/content/ItemContent.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/content/ItemContent.php
b/repo/includes/content/ItemContent.php
index c2f763f..6327797 100644
--- a/repo/includes/content/ItemContent.php
+++ b/repo/includes/content/ItemContent.php
@@ -179,7 +179,12 @@
// $pageUrl shouldn't be a raw param (it's causing the link not
to be parsed)
return new \Message(
'wikibase-error-sitelink-already-used',
- array( $pageUrl, $conflict['sitePage'],
$conflictingPage->getTitle()->getFullText() )
+ array(
+ $pageUrl,
+ $conflict['sitePage'],
+ $conflictingPage->getTitle()->getFullText(),
+ $conflict['siteId'],
+ )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/79194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d8ae757e41b55113ee3f93a3238223ddbd5e9bb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
