| Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
| — | — | @@ -827,9 +827,10 @@ |
| 828 | 828 | } |
| 829 | 829 | |
| 830 | 830 | // show from this onward link |
| 831 | | - $now = $wgLang->timeanddate( wfTimestampNow(), true ); |
| | 831 | + $timestamp = wfTimestampNow(); |
| | 832 | + $now = $wgLang->timeanddate( $timestamp, true ); |
| 832 | 833 | $tl = $this->makeOptionsLink( |
| 833 | | - $now, array( 'from' => wfTimestampNow() ), $nondefaults |
| | 834 | + $now, array( 'from' => $timestamp ), $nondefaults |
| 834 | 835 | ); |
| 835 | 836 | |
| 836 | 837 | $rclinks = wfMsgExt( 'rclinks', array( 'parseinline', 'replaceafter' ), |
| Index: trunk/phase3/includes/specials/SpecialWatchlist.php |
| — | — | @@ -299,12 +299,13 @@ |
| 300 | 300 | |
| 301 | 301 | $wlInfo = ''; |
| 302 | 302 | if( $values['days'] >= 1 ) { |
| | 303 | + $timestamp = wfTimestampNow(); |
| 303 | 304 | $wlInfo = wfMsgExt( 'rcnote', 'parseinline', |
| 304 | 305 | $wgLang->formatNum( $numRows ), |
| 305 | 306 | $wgLang->formatNum( $values['days'] ), |
| 306 | | - $wgLang->timeAndDate( wfTimestampNow(), true ), |
| 307 | | - $wgLang->date( wfTimestampNow(), true ), |
| 308 | | - $wgLang->time( wfTimestampNow(), true ) |
| | 307 | + $wgLang->timeAndDate( $timestamp, true ), |
| | 308 | + $wgLang->date( $timestamp, true ), |
| | 309 | + $wgLang->time( $timestamp, true ) |
| 309 | 310 | ) . '<br />'; |
| 310 | 311 | } elseif( $values['days'] > 0 ) { |
| 311 | 312 | $wlInfo = wfMsgExt( 'wlnote', 'parseinline', |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -613,7 +613,8 @@ |
| 614 | 614 | $autoblock->setTarget( $autoblockIP ); |
| 615 | 615 | $autoblock->setBlocker( $this->getBlocker() ); |
| 616 | 616 | $autoblock->mReason = wfMsgForContent( 'autoblocker', $this->getTarget(), $this->mReason ); |
| 617 | | - $autoblock->mTimestamp = wfTimestampNow(); |
| | 617 | + $timestamp = wfTimestampNow(); |
| | 618 | + $autoblock->mTimestamp = $timestamp; |
| 618 | 619 | $autoblock->mAuto = 1; |
| 619 | 620 | $autoblock->prevents( 'createaccount', $this->prevents( 'createaccount' ) ); |
| 620 | 621 | # Continue suppressing the name if needed |
| — | — | @@ -623,11 +624,11 @@ |
| 624 | 625 | $dbr = wfGetDB( DB_SLAVE ); |
| 625 | 626 | if ( $this->mTimestamp == $dbr->getInfinity() ) { |
| 626 | 627 | # Original block was indefinite, start an autoblock now |
| 627 | | - $autoblock->mExpiry = Block::getAutoblockExpiry( wfTimestampNow() ); |
| | 628 | + $autoblock->mExpiry = Block::getAutoblockExpiry( $timestamp ); |
| 628 | 629 | } else { |
| 629 | 630 | # If the user is already blocked with an expiry date, we don't |
| 630 | 631 | # want to pile on top of that. |
| 631 | | - $autoblock->mExpiry = min( $this->mExpiry, Block::getAutoblockExpiry( wfTimestampNow() ) ); |
| | 632 | + $autoblock->mExpiry = min( $this->mExpiry, Block::getAutoblockExpiry( $timestamp ) ); |
| 632 | 633 | } |
| 633 | 634 | |
| 634 | 635 | # Insert the block... |
| — | — | @@ -662,12 +663,13 @@ |
| 663 | 664 | * @return Boolean |
| 664 | 665 | */ |
| 665 | 666 | public function isExpired() { |
| 666 | | - wfDebug( "Block::isExpired() checking current " . wfTimestampNow() . " vs $this->mExpiry\n" ); |
| | 667 | + $timestamp = wfTimestampNow(); |
| | 668 | + wfDebug( "Block::isExpired() checking current " . $timestamp . " vs $this->mExpiry\n" ); |
| 667 | 669 | |
| 668 | 670 | if ( !$this->mExpiry ) { |
| 669 | 671 | return false; |
| 670 | 672 | } else { |
| 671 | | - return wfTimestampNow() > $this->mExpiry; |
| | 673 | + return $timestamp > $this->mExpiry; |
| 672 | 674 | } |
| 673 | 675 | } |
| 674 | 676 | |