Revert r113650 and reapply r113619 and r113649 with one modification: User::createNew...

[lhc/web/wiklou.git] / includes / Action.php

diff --git a/includes/Action.php b/includes/Action.php
index 66f3513..84c0f80 100644 (file)
--- a/includes/Action.php
+++ b/includes/Action.php
@@ -128,7 +128,7 @@ abstract class Action {
                if ( !$context->canUseWikiPage() ) {
                        return 'view';
                }
-               
+
                $action = Action::factory( $actionName, $context->getWikiPage() );
                if ( $action instanceof Action ) {
                        return $action->getName();
@@ -277,7 +277,7 @@ abstract class Action {
                }
 
                if ( $this->requiresUnblock() && $user->isBlocked() ) {
-                       $block = $user->mBlock;
+                       $block = $user->getBlock();
                        throw new UserBlockedError( $block );
                }