[MediaWiki-commits] [Gerrit] Reuse duplicate code in LinkTitles - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Reuse duplicate code in LinkTitles
..
Reuse duplicate code in LinkTitles
Change-Id: I3b76d7889c6588fcffad6404cc503033a6ed94ff
---
M repo/includes/api/LinkTitles.php
1 file changed, 8 insertions(+), 17 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index 90ca0d8..dffe79b 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -48,34 +48,19 @@
$params = $this->extractRequestParams();
$this->validateParameters( $params );
- $user = $this->getUser();
$sites = $this->getSiteLinkTargetSites();
- // Get all parts for the from-link
// Site is already tested through allowed params ;)
$fromSite = $sites->getSite( $params['fromsite'] );
- // This must be tested now
$fromPage = $fromSite->normalizePageName( $params['fromtitle']
);
-
- if ( $fromPage === false ) {
- wfProfileOut( __METHOD__ );
- $this->dieUsage( 'The external client site did not
provide page information for the from page' , 'no-external-page' );
- }
-
- // This is used for testing purposes later
+ $this->validatePage( $fromPage, 'from' );
$fromId =
StoreFactory::getStore()->newSiteLinkCache()->getItemIdForLink(
$params['fromsite'], $fromPage );
- // Get all part for the to-link
// Site is already tested through allowed params ;)
$toSite = $sites->getSite( $params['tosite'] );
// This must be tested now
$toPage = $toSite->normalizePageName( $params['totitle'] );
-
- if ( $toPage === false ) {
- wfProfileOut( __METHOD__ );
- $this->dieUsage( 'The external client site did not
provide page information for the to page' , 'no-external-page' );
- }
- // This is used for testing purposes later
+ $this->validatePage( $toPage, 'to' );
$toId =
StoreFactory::getStore()->newSiteLinkCache()->getItemIdForLink(
$params['tosite'], $toPage );
$return = array();
@@ -277,4 +262,10 @@
);
}
+ private function validatePage( $page, $label ) {
+ if ( $page === false ) {
+ $this->dieUsage( "The external client site did not
provide page information for the {$label} page" , 'no-external-page' );
+ }
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/82596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b76d7889c6588fcffad6404cc503033a6ed94ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Jeroen De Dauw
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reuse duplicate code in LinkTitles - change (mediawiki...Wikibase)
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/82596
Change subject: Reuse duplicate code in LinkTitles
..
Reuse duplicate code in LinkTitles
Change-Id: I3b76d7889c6588fcffad6404cc503033a6ed94ff
---
M repo/includes/api/LinkTitles.php
1 file changed, 8 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/96/82596/1
diff --git a/repo/includes/api/LinkTitles.php b/repo/includes/api/LinkTitles.php
index 90ca0d8..dffe79b 100644
--- a/repo/includes/api/LinkTitles.php
+++ b/repo/includes/api/LinkTitles.php
@@ -48,34 +48,19 @@
$params = $this->extractRequestParams();
$this->validateParameters( $params );
- $user = $this->getUser();
$sites = $this->getSiteLinkTargetSites();
- // Get all parts for the from-link
// Site is already tested through allowed params ;)
$fromSite = $sites->getSite( $params['fromsite'] );
- // This must be tested now
$fromPage = $fromSite->normalizePageName( $params['fromtitle']
);
-
- if ( $fromPage === false ) {
- wfProfileOut( __METHOD__ );
- $this->dieUsage( 'The external client site did not
provide page information for the from page' , 'no-external-page' );
- }
-
- // This is used for testing purposes later
+ $this->validatePage( $fromPage, 'from' );
$fromId =
StoreFactory::getStore()->newSiteLinkCache()->getItemIdForLink(
$params['fromsite'], $fromPage );
- // Get all part for the to-link
// Site is already tested through allowed params ;)
$toSite = $sites->getSite( $params['tosite'] );
// This must be tested now
$toPage = $toSite->normalizePageName( $params['totitle'] );
-
- if ( $toPage === false ) {
- wfProfileOut( __METHOD__ );
- $this->dieUsage( 'The external client site did not
provide page information for the to page' , 'no-external-page' );
- }
- // This is used for testing purposes later
+ $this->validatePage( $toPage, 'to' );
$toId =
StoreFactory::getStore()->newSiteLinkCache()->getItemIdForLink(
$params['tosite'], $toPage );
$return = array();
@@ -277,4 +262,10 @@
);
}
+ private function validatePage( $page, $label ) {
+ if ( $page === false ) {
+ $this->dieUsage( "The external client site did not
provide page information for the {$label} page" , 'no-external-page' );
+ }
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/82596
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b76d7889c6588fcffad6404cc503033a6ed94ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
