jenkins-bot has submitted this change and it was merged.
Change subject: Some style fixes in SpecialSetSiteLink::setSiteLink
......................................................................
Some style fixes in SpecialSetSiteLink::setSiteLink
Change-Id: Id549a543ba7ce45c94e58c02c8cebaab484f14cc
---
M repo/includes/specials/SpecialSetSiteLink.php
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/specials/SpecialSetSiteLink.php
b/repo/includes/specials/SpecialSetSiteLink.php
index 40a7c27..a8ae97e 100644
--- a/repo/includes/specials/SpecialSetSiteLink.php
+++ b/repo/includes/specials/SpecialSetSiteLink.php
@@ -242,24 +242,24 @@
* @since 0.4
*
* @param \Wikibase\EntityContent $entityContent
- * @param string $site
+ * @param string $siteId
* @param string $page
* @param string &$summary The summary for this edit will be saved here.
*
* @return Status
*/
- protected function setSiteLink( $entityContent, $site, $page, &$summary
) {
- $siteObject = \Sites::singleton()->getSite( $site );
+ protected function setSiteLink( $entityContent, $siteId, $page,
&$summary ) {
+ $site = \Sites::singleton()->getSite( $siteId );
$status = \Status::newGood();
- if ( $siteObject === null ) {
- $status->error( 'wikibase-setsitelink-invalid-site',
$site );
+ if ( $site === null ) {
+ $status->error( 'wikibase-setsitelink-invalid-site',
$siteId );
return $status;
}
if ( $page !== '' ) {
// Don't try to normalize an empty string (which means:
remove the link)
- $page = $siteObject->normalizePageName( $page );
+ $page = $site->normalizePageName( $page );
if ( $page === false ) {
$status->error(
'wikibase-error-ui-no-external-page' );
@@ -268,16 +268,16 @@
}
if ( $page === '' ) {
- $link = $entityContent->getItem()->getSiteLink( $site );
+ $link = $entityContent->getItem()->getSiteLink( $siteId
);
if ( !$link ) {
$status->error(
'wikibase-setsitelink-remove-failed' );
return $status;
}
- $entityContent->getItem()->removeSitelink( $site );
+ $entityContent->getItem()->removeSiteLink( $siteId );
$i18n = 'wbsetsitelink-remove';
}
else {
- $siteLink = new SiteLink( $siteObject, $page );
+ $siteLink = new SiteLink( $site, $page );
$ret = $entityContent->getItem()->addSiteLink(
$siteLink, 'set' );
if ( $ret === false ) {
$status->error(
'wikibase-setsitelink-add-failed' );
@@ -285,7 +285,7 @@
}
$i18n = 'wbsetsitelink-set';
}
- $summary = $this->getSummary( $site, $page, $i18n ); //
$summary is passed by reference ( &$summary )
+ $summary = $this->getSummary( $siteId, $page, $i18n ); //
$summary is passed by reference ( &$summary )
return $status;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/67895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id549a543ba7ce45c94e58c02c8cebaab484f14cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
