Bene has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68043
Change subject: fixed error message in Special:SetSiteLink
......................................................................
fixed error message in Special:SetSiteLink
Change-Id: I32088d940effa47d863efc1b5e47e241f6e6e304
---
M repo/includes/content/ItemContent.php
M repo/includes/specials/SpecialModifyEntity.php
M repo/includes/specials/SpecialSetSiteLink.php
3 files changed, 11 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/43/68043/1
diff --git a/repo/includes/content/ItemContent.php
b/repo/includes/content/ItemContent.php
index 8517337..c160a5c 100644
--- a/repo/includes/content/ItemContent.php
+++ b/repo/includes/content/ItemContent.php
@@ -178,8 +178,7 @@
$pageUrl = $site->getPageUrl( $conflict['sitePage'] );
$msg = new \Message( 'wikibase-error-sitelink-already-used' );
- $msg->rawParams( $pageUrl );
- $msg->params( array( $conflict['sitePage'],
$conflictingPage->getTitle()->getFullText() ) );
+ $msg->params( array( $pageUrl, $conflict['sitePage'],
$conflictingPage->getTitle()->getFullText() ) );
return $msg;
}
diff --git a/repo/includes/specials/SpecialModifyEntity.php
b/repo/includes/specials/SpecialModifyEntity.php
index 7a5ab40..4dd9a68 100644
--- a/repo/includes/specials/SpecialModifyEntity.php
+++ b/repo/includes/specials/SpecialModifyEntity.php
@@ -90,7 +90,9 @@
);
if ( !$editEntity->isSuccess() ) {
- $editEntity->showErrorPage();
+ $errors =
$editEntity->getStatus()->getErrorsArray();
+ $this->showErrorHTML( $errors[0]->parse() );
+ $this->setForm();
}
else {
$entityUrl =
$this->entityContent->getTitle()->getFullUrl();
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 40a7c27..45eb6cb 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -257,16 +257,7 @@
return $status;
}
- if ( $page !== '' ) {
- // Don't try to normalize an empty string (which means:
remove the link)
- $page = $siteObject->normalizePageName( $page );
-
- if ( $page === false ) {
- $status->error(
'wikibase-error-ui-no-external-page' );
- return $status;
- }
- }
-
+ // empty page means remove site link
if ( $page === '' ) {
$link = $entityContent->getItem()->getSiteLink( $site );
if ( !$link ) {
@@ -277,6 +268,12 @@
$i18n = 'wbsetsitelink-remove';
}
else {
+ // Try to normalize the page name
+ $page = $siteObject->normalizePageName( $page );
+ if ( $page === false ) {
+ $status->error(
'wikibase-error-ui-no-external-page' );
+ return $status;
+ }
$siteLink = new SiteLink( $siteObject, $page );
$ret = $entityContent->getItem()->addSiteLink(
$siteLink, 'set' );
if ( $ret === false ) {
--
To view, visit https://gerrit.wikimedia.org/r/68043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32088d940effa47d863efc1b5e47e241f6e6e304
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
