| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -371,8 +371,9 @@ |
| 372 | 372 | $this->mTitle->mArticleID = $data->page_id; |
| 373 | 373 | $this->mTitle->mTouched = wfTimestamp( TS_MW, $data->page_touched ); |
| 374 | 374 | |
| 375 | | - # Old-fashioned restrictions. |
| 376 | | - $this->mTitle->loadRestrictions( $data->page_restrictions ); |
| | 375 | + # Old-fashioned restrictions |
| | 376 | + if( $data->page_restrictions ) |
| | 377 | + $this->mTitle->loadRestrictions( $data->page_restrictions ); |
| 377 | 378 | |
| 378 | 379 | $this->mCounter = $data->page_counter; |
| 379 | 380 | $this->mTouched = wfTimestamp( TS_MW, $data->page_touched ); |
| — | — | @@ -686,7 +687,7 @@ |
| 687 | 688 | |
| 688 | 689 | # Try file cache |
| 689 | 690 | if( $oldid === 0 && $this->checkTouched() ) { |
| 690 | | - $wgOut->setETag($parserCache->getETag($this, $wgUser)); |
| | 691 | + $wgOut->setETag( $parserCache->getETag($this,$wgUser) ); |
| 691 | 692 | if( $wgOut->checkLastModified( $this->getTouched() ) ){ |
| 692 | 693 | wfProfileOut( __METHOD__ ); |
| 693 | 694 | return; |