[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: ApiReview: Don't use $wgUser

2017-09-13 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/377702 )

Change subject: ApiReview: Don't use $wgUser
..


ApiReview: Don't use $wgUser

All of the other deprecated stuff should get removed too, but this is a
start...

Change-Id: I4769a33783a473dfc0a702d6a5aa09ceabc1
---
M api/actions/ApiReview.php
1 file changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/api/actions/ApiReview.php b/api/actions/ApiReview.php
index 8a80692..4e224de 100644
--- a/api/actions/ApiReview.php
+++ b/api/actions/ApiReview.php
@@ -33,21 +33,20 @@
 * except that it generates the template and image parameters itself.
 */
public function execute() {
-   global $wgUser;
$params = $this->extractRequestParams();
// Check basic permissions
if ( is_callable( [ $this, 'checkUserRightsAny' ] ) ) {
$this->checkUserRightsAny( 'review' );
} else {
-   if ( !$wgUser->isAllowed( 'review' ) ) {
+   if ( !$this->getUser()->isAllowed( 'review' ) ) {
$this->dieUsage( "You don't have the right to 
review revisions.",
'permissiondenied' );
}
}
 
-   if ( $wgUser->isBlocked( false ) ) {
+   if ( $this->getUser()->isBlocked( false ) ) {
if ( is_callable( [ $this, 'dieBlocked' ] ) ) {
-   $this->dieBlocked( $wgUser->getBlock() );
+   $this->dieBlocked( $this->getUser()->getBlock() 
);
} else {
$this->dieUsageMsg( [ 'blockedtext' ] );
}
@@ -66,7 +65,7 @@
$title = $rev->getTitle();
 
// Construct submit form...
-   $form = new RevisionReviewForm( $wgUser );
+   $form = new RevisionReviewForm( $this->getUser() );
$form->setPage( $title );
$form->setOldId( $revid );
$form->setApprove( empty( $params['unapprove'] ) );
@@ -94,7 +93,7 @@
}
// Now get the template and image parameters needed
list( $templateIds, $fileTimeKeys ) =
-   FRInclusionCache::getRevIncludes( $article, 
$rev, $wgUser );
+   FRInclusionCache::getRevIncludes( $article, 
$rev, $this->getUser() );
// Get version parameters for review submission (flat 
strings)
list( $templateParams, $imageParams, $fileParam ) =
RevisionReviewForm::getIncludeParams( 
$templateIds, $fileTimeKeys, $fileVer );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4769a33783a473dfc0a702d6a5aa09ceabc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Jackmcbarn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...FlaggedRevs[master]: ApiReview: Don't use $wgUser

2017-09-12 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/377702 )

Change subject: ApiReview: Don't use $wgUser
..

ApiReview: Don't use $wgUser

All of the other deprecated stuff should get removed too, but this is a
start...

Change-Id: I4769a33783a473dfc0a702d6a5aa09ceabc1
---
M api/actions/ApiReview.php
1 file changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs 
refs/changes/02/377702/1

diff --git a/api/actions/ApiReview.php b/api/actions/ApiReview.php
index 8a80692..4e224de 100644
--- a/api/actions/ApiReview.php
+++ b/api/actions/ApiReview.php
@@ -33,21 +33,20 @@
 * except that it generates the template and image parameters itself.
 */
public function execute() {
-   global $wgUser;
$params = $this->extractRequestParams();
// Check basic permissions
if ( is_callable( [ $this, 'checkUserRightsAny' ] ) ) {
$this->checkUserRightsAny( 'review' );
} else {
-   if ( !$wgUser->isAllowed( 'review' ) ) {
+   if ( !$this->getUser()->isAllowed( 'review' ) ) {
$this->dieUsage( "You don't have the right to 
review revisions.",
'permissiondenied' );
}
}
 
-   if ( $wgUser->isBlocked( false ) ) {
+   if ( $this->getUser()->isBlocked( false ) ) {
if ( is_callable( [ $this, 'dieBlocked' ] ) ) {
-   $this->dieBlocked( $wgUser->getBlock() );
+   $this->dieBlocked( $this->getUser()->getBlock() 
);
} else {
$this->dieUsageMsg( [ 'blockedtext' ] );
}
@@ -66,7 +65,7 @@
$title = $rev->getTitle();
 
// Construct submit form...
-   $form = new RevisionReviewForm( $wgUser );
+   $form = new RevisionReviewForm( $this->getUser() );
$form->setPage( $title );
$form->setOldId( $revid );
$form->setApprove( empty( $params['unapprove'] ) );
@@ -94,7 +93,7 @@
}
// Now get the template and image parameters needed
list( $templateIds, $fileTimeKeys ) =
-   FRInclusionCache::getRevIncludes( $article, 
$rev, $wgUser );
+   FRInclusionCache::getRevIncludes( $article, 
$rev, $this->getUser() );
// Get version parameters for review submission (flat 
strings)
list( $templateParams, $imageParams, $fileParam ) =
RevisionReviewForm::getIncludeParams( 
$templateIds, $fileTimeKeys, $fileVer );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4769a33783a473dfc0a702d6a5aa09ceabc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits