From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 21 Jan 2007 13:47:11 +0000 (+0000)
Subject: Reorder conditions from Werdna's previous commit; shortcut if not a user CSS/JS subpa... 
X-Git-Tag: 1.31.0-rc.0~54252
X-Git-Url: https://git.cyclocoop.org/admin//%22%7B%7Blocalurle:Special:Imagelist%7D%7D/%22?a=commitdiff_plain;h=29b13ab9e4886fcd668b8f5a04e87af65cf89b6e;p=lhc%2Fweb%2Fwiklou.git

Reorder conditions from Werdna's previous commit; shortcut if not a user CSS/JS subpage to avoid the expensive queries
---

diff --git a/includes/Title.php b/includes/Title.php
index aa4727c9b3..62080d87b2 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1148,7 +1148,7 @@ class Title {
 			return false;
 		}
 		
-		if ( $doExpensiveQueries && $this->isCascadeProtected() && !$this->isCssJsSubpage() ) {
+		if ( $doExpensiveQueries && !$this->isCssJsSubpage() && $this->isCascadeProtected() ) {
 			# We /could/ use the protection level on the source page, but it's fairly ugly
 			#  as we have to establish a precedence hierarchy for pages included by multiple
 			#  cascade-protected pages. So just restrict it to people with 'protect' permission,