moved call to spreadBlock() to getBlockedStatus(). This means one less query per...

diff --git a/includes/User.php b/includes/User.php
index 8f51b13..9fb1fd0 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -265,6 +265,7 @@ class User {
                        if ( $block->load( $wgIP , $this->mId ) ) {
                                $this->mBlockedby = $block->mBy;
                                $this->mBlockreason = $block->mReason;
+                               $this->spreadBlock();
                        }
                }
 
@@ -392,7 +393,6 @@ class User {
                                else
                                        wfDebug( "User::loadFromSession() unable to save to memcached\n" );
                        }
-                       $user->spreadBlock();
                        return $user;
                }
                return new User(); # Can't log in from session