From: Daniel Cannon <amidaniel@users.mediawiki.org>
Date: Sat, 7 Jul 2007 07:02:54 +0000 (+0000)
Subject: Per-page protection should take precedence over namespace protection when deciding... 
X-Git-Tag: 1.31.0-rc.0~52213
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=eed96a39e3c8a3531c0cbcece1c7238f5e8bb7e8;p=lhc%2Fweb%2Fwiklou.git

Per-page protection should take precedence over namespace protection when deciding what message to display.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 527b92c028..ffc10b2111 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -976,7 +976,7 @@ class OutputPage {
 					foreach( $cascadeSources as $title )
 						$titles .= "* [[:" . $title->getPrefixedText()  . "]]\n";
 					$this->addWikiText( wfMsgExt( 'cascadeprotected', 'parsemag', $count ) . "\n{$titles}" );
-			} elseif( $wgTitle->isNamespaceProtected() ) {
+			} elseif( !$wgTitle->isProtected( 'edit' ) && $wgTitle->isNamespaceProtected() ) {
 				// Namespace protection
 				global $wgNamespaceProtection;
 				$ns = $wgTitle->getNamespace() == NS_MAIN