Index: trunk/extensions/OnlineStatusBar/OnlineStatusBar.status.php |
— | — | @@ -27,11 +27,10 @@ |
28 | 28 | $t_time = OnlineStatusBar::getTimeoutDate(); |
29 | 29 | $dbr = wfGetDB( DB_SLAVE ); |
30 | 30 | $w_time = OnlineStatusBar::getTimeoutDate( true ); |
31 | | - $result = $dbr->selectField( 'online_status', 'username', array( 'username' => $user->getName(), |
| 31 | + $result = $dbr->selectField( 'online_status', 'timestamp', array( 'username' => $user->getName(), |
32 | 32 | "timestamp > " . $dbr->addQuotes( $dbr->timestamp( $t_time ) ) ), |
33 | 33 | __METHOD__, array( 'LIMIT 1', 'ORDER BY timestamp DESC' ) ); |
34 | 34 | |
35 | | - |
36 | 35 | if ( $result === false ) { |
37 | 36 | $status = $wgOnlineStatusBarDefaultOffline; |
38 | 37 | } else { |
— | — | @@ -39,7 +38,7 @@ |
40 | 39 | if ( $user->isLoggedIn() ) { |
41 | 40 | $status = $user->getOption( 'OnlineStatusBar_status', $wgOnlineStatusBarDefaultOnline ); |
42 | 41 | if ( $delayed_check ) { |
43 | | - if ( $result[0]->timestamp > w_time ) { |
| 42 | + if ( $result < $w_time ) { |
44 | 43 | $status = 'write'; |
45 | 44 | } |
46 | 45 | } |
Index: trunk/extensions/OnlineStatusBar/OnlineStatusBar.body.php |
— | — | @@ -131,7 +131,7 @@ |
132 | 132 | global $wgOnlineStatusBar_WriteTime, $wgOnlineStatusBar_LogoutTime; |
133 | 133 | |
134 | 134 | if ($delayed) { |
135 | | - return wfTimestamp( TS_UNIX ) - $wgOnlineStatusBar_WriteTime; |
| 135 | + return wfTimestamp( TS_UNIX ) + $wgOnlineStatusBar_WriteTime; |
136 | 136 | } |
137 | 137 | |
138 | 138 | return wfTimestamp( TS_UNIX ) - $wgOnlineStatusBar_LogoutTime; |