| Index: trunk/phase3/includes/Revision.php |
| — | — | @@ -314,8 +314,8 @@ |
| 315 | 315 | |
| 316 | 316 | if( isset( $row->page_latest ) ) { |
| 317 | 317 | $this->mCurrent = ( $row->rev_id == $row->page_latest ); |
| 318 | | - $this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title ); |
| 319 | | - $this->mTitle->resetArticleID( $this->mPage ); |
| | 318 | + $row->page_id = $this->mPage; |
| | 319 | + $this->mTitle = Title::newFromRow( $row ); |
| 320 | 320 | } else { |
| 321 | 321 | $this->mCurrent = false; |
| 322 | 322 | $this->mTitle = null; |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -861,8 +861,8 @@ |
| 862 | 862 | # BEGIN DatabaseMssql hack |
| 863 | 863 | # Since MSSQL doesn't recognize the infinity keyword, set date manually. |
| 864 | 864 | # TO-DO: Refactor for better DB portability and remove magic date |
| 865 | | - $dbw = wfGetDB( DB_MASTER ); |
| 866 | | - if ( $dbw instanceof DatabaseMssql ) { |
| | 865 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 866 | + if ( $dbr->getType() == 'mssql' ) { |
| 867 | 867 | return '3000-01-31 00:00:00.000'; |
| 868 | 868 | } |
| 869 | 869 | # End DatabaseMssql hack |