| Index: branches/wmf-deployment/extensions/LiquidThreads/classes/Thread.php |
| — | — | @@ -135,8 +135,9 @@ |
| 136 | 136 | global $wgUser; |
| 137 | 137 | |
| 138 | 138 | global $wgThreadActionsNoBump; |
| 139 | | - if ( !in_array( $change_type, $wgThreadActionsNoBump ) ) { |
| 140 | | - $this->sortkey = wfTimestampNow(); |
| | 139 | + $bump = !in_array( $change_type, $wgThreadActionsNoBump ); |
| | 140 | + if ( $bump ) { |
| | 141 | + $this->sortkey = wfTimestampNow( TS_DB ); |
| 141 | 142 | } |
| 142 | 143 | |
| 143 | 144 | $this->modified = wfTimestampNow(); |
| — | — | @@ -145,6 +146,7 @@ |
| 146 | 147 | |
| 147 | 148 | $topmost = $this->topmostThread(); |
| 148 | 149 | $topmost->modified = wfTimestampNow(); |
| | 150 | + if ( $bump ) $topmost->setSortkey( wfTimestampNow( TS_DB ) ); |
| 149 | 151 | $topmost->save(); |
| 150 | 152 | |
| 151 | 153 | ThreadRevision::create( $this, $change_type, $change_object, $reason ); |
| — | — | @@ -352,7 +354,7 @@ |
| 353 | 355 | $dbr = wfGetDB( DB_SLAVE ); |
| 354 | 356 | $this->modified = $dbr->timestamp( wfTimestampNow() ); |
| 355 | 357 | $this->created = $dbr->timestamp( wfTimestampNow() ); |
| 356 | | - $this->sortkey = $dbr->timestamp( wfTimestampNow() ); |
| | 358 | + $this->sortkey = wfTimestampNow( TS_DB ); |
| 357 | 359 | $this->editedness = Threads::EDITED_NEVER; |
| 358 | 360 | $this->replyCount = 0; |
| 359 | 361 | return; |
| — | — | @@ -1175,7 +1177,7 @@ |
| 1176 | 1178 | function setSortKey( $k = null ) { |
| 1177 | 1179 | if ( is_null($k) ) { |
| 1178 | 1180 | $dbr = wfGetDB( DB_SLAVE ); |
| 1179 | | - $k = $dbr->timestamp( wfTimestampNow() ); |
| | 1181 | + $k = wfTimestampNow( TS_DB ); |
| 1180 | 1182 | } |
| 1181 | 1183 | |
| 1182 | 1184 | $this->sortkey = $k; |
| Property changes on: branches/wmf-deployment/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1183 | 1185 | - /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /trunk/extensions/LiquidThreads:56151-57522 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |
| 1184 | 1186 | + /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /trunk/extensions/LiquidThreads:56151-57522,57524 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447 |