| Index: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | |
| 83 | 83 | $user = User::newFromName( $title->getBaseText() ); |
| 84 | 84 | // Invalid user |
| 85 | | - if ( $user === false ) { |
| | 85 | + if ( !($user instanceof User) ) { |
| 86 | 86 | return false; |
| 87 | 87 | } |
| 88 | 88 | if ( !self::isValid( $user ) ) { |
| — | — | @@ -134,22 +134,21 @@ |
| 135 | 135 | */ |
| 136 | 136 | public static function purge( $user_type ) { |
| 137 | 137 | if ( $user_type instanceof User ) { |
| 138 | | - $old_user = $user_type; |
| | 138 | + $user = $user_type; |
| 139 | 139 | } else if ( is_string( $user_type ) ){ |
| 140 | | - $old_user = User::newFromName( $user_type ); |
| | 140 | + $user = User::newFromName( $user_type ); |
| 141 | 141 | } else { |
| 142 | 142 | return false; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // check if something weird didn't happen |
| 146 | | - if ( $old_user === false || $old_user == null ) { |
| 147 | | - return false; |
| 148 | | - } |
| 149 | | - // purge both pages now |
| 150 | | - if ( $old_user->getOption('OnlineStatusBar_active', false) ) { |
| 151 | | - if ( $old_user->getOption('OnlineStatusBar_autoupdate', false) == true ) { |
| 152 | | - WikiPage::factory( $old_user->getUserPage() )->doPurge(); |
| 153 | | - WikiPage::factory( $old_user->getTalkPage() )->doPurge(); |
| | 146 | + if ( $user instanceof User ) { |
| | 147 | + // purge both pages now |
| | 148 | + if ( $user->getOption('OnlineStatusBar_active', false) ) { |
| | 149 | + if ( $user->getOption('OnlineStatusBar_autoupdate', false) == true ) { |
| | 150 | + WikiPage::factory( $user->getUserPage() )->doPurge(); |
| | 151 | + WikiPage::factory( $user->getTalkPage() )->doPurge(); |
| | 152 | + } |
| 154 | 153 | } |
| 155 | 154 | } |
| 156 | 155 | return true; |
| — | — | @@ -187,7 +186,7 @@ |
| 188 | 187 | return false; |
| 189 | 188 | } |
| 190 | 189 | } |
| 191 | | - // if user doesn't want to be tracked leave him aswel for privacy reasons |
| | 190 | + // if user doesn't want to be tracked leave it as well for privacy reasons |
| 192 | 191 | if ( $wgUser->isLoggedIn() && !$wgUser->getOption ( "OnlineStatusBar_active", $wgOnlineStatusBarDefaultEnabled ) ) { |
| 193 | 192 | return false; |
| 194 | 193 | } |