| Index: trunk/phase3/includes/WikiPage.php |
| — | — | @@ -82,6 +82,8 @@ |
| 83 | 83 | * Always override this for all subclasses (until we use PHP with LSB) |
| 84 | 84 | * |
| 85 | 85 | * @param $id Int article ID to load |
| | 86 | + * |
| | 87 | + * @return WikiPage |
| 86 | 88 | */ |
| 87 | 89 | public static function newFromID( $id ) { |
| 88 | 90 | $t = Title::newFromID( $id ); |
| — | — | @@ -278,6 +280,8 @@ |
| 279 | 281 | /** |
| 280 | 282 | * Return the list of revision fields that should be selected to create |
| 281 | 283 | * a new page. |
| | 284 | + * |
| | 285 | + * @return array |
| 282 | 286 | */ |
| 283 | 287 | public static function selectFields() { |
| 284 | 288 | return array( |
| — | — | @@ -535,7 +539,7 @@ |
| 536 | 540 | * Revision::FOR_THIS_USER to be displayed to $wgUser |
| 537 | 541 | * Revision::RAW get the text regardless of permissions |
| 538 | 542 | * @return String|false The text of the current revision |
| 539 | | - */ |
| | 543 | + */ |
| 540 | 544 | public function getText( $audience = Revision::FOR_PUBLIC ) { |
| 541 | 545 | $this->loadLastEdit(); |
| 542 | 546 | if ( $this->mLastRevision ) { |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -346,13 +346,13 @@ |
| 347 | 347 | protected function initFromRow( $row ) { |
| 348 | 348 | $this->setTarget( $row->ipb_address ); |
| 349 | 349 | $this->setBlocker( User::newFromId( $row->ipb_by ) ); |
| 350 | | - |
| | 350 | + |
| 351 | 351 | $this->mReason = $row->ipb_reason; |
| 352 | 352 | $this->mTimestamp = wfTimestamp( TS_MW, $row->ipb_timestamp ); |
| 353 | 353 | $this->mAuto = $row->ipb_auto; |
| 354 | 354 | $this->mHideName = $row->ipb_deleted; |
| 355 | 355 | $this->mId = $row->ipb_id; |
| 356 | | - |
| | 356 | + |
| 357 | 357 | // I wish I didn't have to do this |
| 358 | 358 | $db = wfGetDB( DB_SLAVE ); |
| 359 | 359 | if ( $row->ipb_expiry == $db->getInfinity() ) { |
| — | — | @@ -643,7 +643,6 @@ |
| 644 | 644 | $autoblock->mHideName = $this->mHideName; |
| 645 | 645 | $autoblock->prevents( 'editownusertalk', $this->prevents( 'editownusertalk' ) ); |
| 646 | 646 | |
| 647 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 648 | 647 | if ( $this->mExpiry == 'infinity' ) { |
| 649 | 648 | # Original block was indefinite, start an autoblock now |
| 650 | 649 | $autoblock->mExpiry = Block::getAutoblockExpiry( $timestamp ); |