| Index: trunk/phase3/includes/specials/SpecialRevisiondelete.php |
| — | — | @@ -218,7 +218,7 @@ |
| 219 | 219 | } else { |
| 220 | 220 | // Run through and pull all our data in one query |
| 221 | 221 | foreach( $this->archrevs as $timestamp ) { |
| 222 | | - $where[] = $timestamp; |
| | 222 | + $where[] = $dbr->timestamp( $timestamp ); |
| 223 | 223 | } |
| 224 | 224 | $result = $dbr->select( 'archive', '*', |
| 225 | 225 | array( |
| — | — | @@ -227,14 +227,15 @@ |
| 228 | 228 | 'ar_timestamp' => $where ), |
| 229 | 229 | __METHOD__ ); |
| 230 | 230 | while( $row = $dbr->fetchObject( $result ) ) { |
| 231 | | - $revObjs[$row->ar_timestamp] = new Revision( array( |
| | 231 | + $timestamp = wfTimestamp( TS_MW, $timestamp ); |
| | 232 | + $revObjs[$timestamp] = new Revision( array( |
| 232 | 233 | 'page' => $this->page->getArticleId(), |
| 233 | 234 | 'id' => $row->ar_rev_id, |
| 234 | 235 | 'text' => $row->ar_text_id, |
| 235 | 236 | 'comment' => $row->ar_comment, |
| 236 | 237 | 'user' => $row->ar_user, |
| 237 | 238 | 'user_text' => $row->ar_user_text, |
| 238 | | - 'timestamp' => $row->ar_timestamp, |
| | 239 | + 'timestamp' => $timestamp, |
| 239 | 240 | 'minor_edit' => $row->ar_minor_edit, |
| 240 | 241 | 'text_id' => $row->ar_text_id, |
| 241 | 242 | 'deleted' => $row->ar_deleted, |
| — | — | @@ -333,7 +334,7 @@ |
| 334 | 335 | if( $this->deleteKey=='oldimage' ) { |
| 335 | 336 | // Run through and pull all our data in one query |
| 336 | 337 | foreach( $this->ofiles as $timestamp ) { |
| 337 | | - $where[] = $dbr->addQuotes( $timestamp.'!'.$this->page->getDBKey() ); |
| | 338 | + $where[] = $timestamp.'!'.$this->page->getDBKey(); |
| 338 | 339 | } |
| 339 | 340 | $result = $dbr->select( 'oldimage', '*', |
| 340 | 341 | array( |
| — | — | @@ -880,7 +881,7 @@ |
| 881 | 882 | $Id_set = array(); |
| 882 | 883 | // Run through and pull all our data in one query |
| 883 | 884 | foreach( $items as $timestamp ) { |
| 884 | | - $where[] = $timestamp; |
| | 885 | + $where[] = $this->dbw->timestamp( $timestamp ); |
| 885 | 886 | } |
| 886 | 887 | $result = $this->dbw->select( 'archive', '*', |
| 887 | 888 | array( |
| — | — | @@ -889,14 +890,15 @@ |
| 890 | 891 | 'ar_timestamp' => $where ), |
| 891 | 892 | __METHOD__ ); |
| 892 | 893 | while( $row = $this->dbw->fetchObject( $result ) ) { |
| 893 | | - $revObjs[$row->ar_timestamp] = new Revision( array( |
| | 894 | + $timestamp = wfTimestamp( TS_MW, $row->ar_timestamp ); |
| | 895 | + $revObjs[$timestamp] = new Revision( array( |
| 894 | 896 | 'page' => $title->getArticleId(), |
| 895 | 897 | 'id' => $row->ar_rev_id, |
| 896 | 898 | 'text' => $row->ar_text_id, |
| 897 | 899 | 'comment' => $row->ar_comment, |
| 898 | 900 | 'user' => $row->ar_user, |
| 899 | 901 | 'user_text' => $row->ar_user_text, |
| 900 | | - 'timestamp' => $row->ar_timestamp, |
| | 902 | + 'timestamp' => $timestamp, |
| 901 | 903 | 'minor_edit' => $row->ar_minor_edit, |
| 902 | 904 | 'text_id' => $row->ar_text_id, |
| 903 | 905 | 'deleted' => $row->ar_deleted, |
| — | — | @@ -950,7 +952,7 @@ |
| 951 | 953 | $set = array(); |
| 952 | 954 | // Run through and pull all our data in one query |
| 953 | 955 | foreach( $items as $timestamp ) { |
| 954 | | - $where[] = $this->dbw->addQuotes( $timestamp.'!'.$title->getDBKey() ); |
| | 956 | + $where[] = $timestamp.'!'.$title->getDBKey(); |
| 955 | 957 | } |
| 956 | 958 | $result = $this->dbw->select( 'oldimage', '*', |
| 957 | 959 | array( |