From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 9 Dec 2008 22:24:21 +0000 (+0000)
Subject: Delay restriction fetching query
X-Git-Tag: 1.31.0-rc.0~44081
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=5acfd2e095dae1b5fbbd7506f907a9ee5072a84f;p=lhc%2Fweb%2Fwiklou.git

Delay restriction fetching query
---

diff --git a/includes/Article.php b/includes/Article.php
index 71939042cd..88b182e140 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -371,8 +371,9 @@ class Article {
 			$this->mTitle->mArticleID = $data->page_id;
 			$this->mTitle->mTouched = wfTimestamp( TS_MW, $data->page_touched );
 
-			# Old-fashioned restrictions.
-			$this->mTitle->loadRestrictions( $data->page_restrictions );
+			# Old-fashioned restrictions
+			if( $data->page_restrictions )
+				$this->mTitle->loadRestrictions( $data->page_restrictions );
 
 			$this->mCounter     = $data->page_counter;
 			$this->mTouched     = wfTimestamp( TS_MW, $data->page_touched );
@@ -686,7 +687,7 @@ class Article {
 
 		# Try file cache
 		if( $oldid === 0 && $this->checkTouched() ) {
-			$wgOut->setETag($parserCache->getETag($this, $wgUser));
+			$wgOut->setETag( $parserCache->getETag($this,$wgUser) );
 			if( $wgOut->checkLastModified( $this->getTouched() ) ){
 				wfProfileOut( __METHOD__ );
 				return;