dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Recalculate user default options for each test"
[lhc/web/wiklou.git]
/
includes
/
specialpage
/
FormSpecialPage.php
diff --git
a/includes/specialpage/FormSpecialPage.php
b/includes/specialpage/FormSpecialPage.php
index
81a0036
..
939460f
100644
(file)
--- a/
includes/specialpage/FormSpecialPage.php
+++ b/
includes/specialpage/FormSpecialPage.php
@@
-31,7
+31,7
@@
abstract class FormSpecialPage extends SpecialPage {
/**
* The sub-page of the special page.
abstract class FormSpecialPage extends SpecialPage {
/**
* The sub-page of the special page.
- * @var string
+ * @var string
|null
*/
protected $par = null;
*/
protected $par = null;
@@
-166,7
+166,7
@@
abstract class FormSpecialPage extends SpecialPage {
/**
* Basic SpecialPage workflow: get a form, send it to the user; get some data back,
*
/**
* Basic SpecialPage workflow: get a form, send it to the user; get some data back,
*
- * @param string $par Subpage string if one was specified
+ * @param string
|null
$par Subpage string if one was specified
*/
public function execute( $par ) {
$this->setParameter( $par );
*/
public function execute( $par ) {
$this->setParameter( $par );
@@
-188,7
+188,7
@@
abstract class FormSpecialPage extends SpecialPage {
/**
* Maybe do something interesting with the subpage parameter
/**
* Maybe do something interesting with the subpage parameter
- * @param string $par
+ * @param string
|null
$par
*/
protected function setParameter( $par ) {
$this->par = $par;
*/
protected function setParameter( $par ) {
$this->par = $par;
@@
-203,9
+203,11
@@
abstract class FormSpecialPage extends SpecialPage {
protected function checkExecutePermissions( User $user ) {
$this->checkPermissions();
protected function checkExecutePermissions( User $user ) {
$this->checkPermissions();
- if ( $this->requiresUnblock()
&& $user->isBlocked()
) {
+ if ( $this->requiresUnblock() ) {
$block = $user->getBlock();
$block = $user->getBlock();
- throw new UserBlockedError( $block );
+ if ( $block && $block->isSitewide() ) {
+ throw new UserBlockedError( $block );
+ }
}
if ( $this->requiresWrite() ) {
}
if ( $this->requiresWrite() ) {