[MediaWiki-commits] [Gerrit] Check for global blocks in addition to regular ones before s... - change (mediawiki...UploadWizard)

2015-09-09 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Check for global blocks in addition to regular ones before 
showing the wizard
..


Check for global blocks in addition to regular ones before showing the wizard

Code adapted from VisualEditor.

Bug: T74
Change-Id: I627c4a3c8ddca2429e61a05eef933ddc22b5e5a3
---
M includes/specials/SpecialUploadWizard.php
1 file changed, 11 insertions(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialUploadWizard.php 
b/includes/specials/SpecialUploadWizard.php
index b46dc95..5bff0ed 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -309,6 +309,17 @@
throw new UserBlockedError( $this->getUser()->mBlock );
}
 
+   // Global blocks
+   if ( class_exists( 'GlobalBlocking' ) ) {
+   $error = GlobalBlocking::getUserBlockErrors(
+   $user,
+   $this->getRequest()->getIP()
+   );
+   if ( count( $error ) ) {
+   throw new ErrorPageError( 'blockedtitle', 
array_shift( $error ), $error );
+   }
+   }
+
// we got all the way here, so it must be okay to upload
return true;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I627c4a3c8ddca2429e61a05eef933ddc22b5e5a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Glaisher 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: MarkTraceur 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Check for global blocks in addition to regular ones before s... - change (mediawiki...UploadWizard)

2015-09-02 Thread Code Review 
Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/235517

Change subject: Check for global blocks in addition to regular ones before 
showing the wizard
..

Check for global blocks in addition to regular ones before showing the wizard

Code adapted from VisualEditor.

Bug: T74
Change-Id: I627c4a3c8ddca2429e61a05eef933ddc22b5e5a3
---
M includes/specials/SpecialUploadWizard.php
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/17/235517/1

diff --git a/includes/specials/SpecialUploadWizard.php 
b/includes/specials/SpecialUploadWizard.php
index b46dc95..5bff0ed 100644
--- a/includes/specials/SpecialUploadWizard.php
+++ b/includes/specials/SpecialUploadWizard.php
@@ -309,6 +309,17 @@
throw new UserBlockedError( $this->getUser()->mBlock );
}
 
+   // Global blocks
+   if ( class_exists( 'GlobalBlocking' ) ) {
+   $error = GlobalBlocking::getUserBlockErrors(
+   $user,
+   $this->getRequest()->getIP()
+   );
+   if ( count( $error ) ) {
+   throw new ErrorPageError( 'blockedtitle', 
array_shift( $error ), $error );
+   }
+   }
+
// we got all the way here, so it must be okay to upload
return true;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I627c4a3c8ddca2429e61a05eef933ddc22b5e5a3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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