| Index: trunk/extensions/TorBlock/TorBlock.class.php |
| — | — | @@ -200,7 +200,7 @@ |
| 201 | 201 | */ |
| 202 | 202 | public static function onGetBlockedStatus( &$user ) { |
| 203 | 203 | global $wgTorDisableAdminBlocks; |
| 204 | | - if ( $wgTorDisableAdminBlocks && self::isExitNode() && $user->isBlocked() && $user->getBlock()->getType() != Block::TYPE_USER ) { |
| | 204 | + if ( $wgTorDisableAdminBlocks && self::isExitNode() && $user->mBlock && $user->mBlock->getType() != Block::TYPE_USER ) { |
| 205 | 205 | wfDebug( "User using Tor node. Disabling IP block as it was probably targetted at the tor node." ); |
| 206 | 206 | |
| 207 | 207 | // Node is probably blocked for being a Tor node. Remove block. |
| Index: trunk/extensions/regexBlock/regexBlockCore.php |
| — | — | @@ -570,16 +570,16 @@ |
| 571 | 571 | } |
| 572 | 572 | /* account creation check goes through the same hook... */ |
| 573 | 573 | if ( $valid['create'] == 1 ) { |
| 574 | | - if ( $user->isBlocked() ) { |
| 575 | | - $user->getBlock()->prevents( 'createaccount', true ); |
| | 574 | + if ( $user->mBlock ) { |
| | 575 | + $user->mBlock->prevents( 'createaccount', true ); |
| 576 | 576 | } |
| 577 | 577 | } |
| 578 | 578 | /* set expiry information */ |
| 579 | | - if ( $user->isBlocked() ) { |
| | 579 | + if ( $user->mBlock ) { |
| 580 | 580 | # $user->mBlock->mId = $valid['blckid']; FIXME: why does this want to do this? |
| 581 | | - $user->getBlock()->mExpiry = $valid['expire']; |
| 582 | | - $user->getBlock()->mTimestamp = $valid['timestamp']; |
| 583 | | - $user->getBlock()->setTarget( ($valid['ip'] == 1) ? wfGetIP() : $user->getName() ); |
| | 581 | + $user->mBlock->mExpiry = $valid['expire']; |
| | 582 | + $user->mBlock->mTimestamp = $valid['timestamp']; |
| | 583 | + $user->mBlock->setTarget( ($valid['ip'] == 1) ? wfGetIP() : $user->getName() ); |
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | $result = self::updateStats( $user, $user_ip, $blocker, $valid['match'], $valid['blckid'] ); |
| Index: trunk/extensions/DynamicPageList/DPLMain.php |
| — | — | @@ -2995,7 +2995,6 @@ |
| 2996 | 2996 | if ( isset( $iTitleMaxLen ) && ( strlen( $sTitleText ) > $iTitleMaxLen ) ) { |
| 2997 | 2997 | $sTitleText = substr( $sTitleText, 0, $iTitleMaxLen ) . '...'; |
| 2998 | 2998 | } |
| 2999 | | - |
| 3000 | 2999 | if ( $bShowCurID && isset( $row->page_id ) ) { |
| 3001 | 3000 | $articleLink = '<html>' . $sk->makeKnownLinkObj( $title, htmlspecialchars( $sTitleText ), 'curid=' . $row->page_id ) . '</html>'; |
| 3002 | 3001 | } elseif ( !$bEscapeLinks && ( $pageNamespace == 14 || $pageNamespace == 6 ) ) { |