From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Wed, 11 Jun 2008 21:36:07 +0000 (+0000)
Subject: Removed $wgEnableCascadingProtection. It was a quite pointless configuration setting... 
X-Git-Tag: 1.31.0-rc.0~47041
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=65e1c0cdebfe31393cd97a1f1e20ca9e58f1a021;p=lhc%2Fweb%2Fwiklou.git

Removed $wgEnableCascadingProtection. It was a quite pointless configuration setting which was not even properly implemented. Cascading protection has been always possible regardless of this configuration setting.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f19dfad2cf..cb1800b1cb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -56,7 +56,10 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   $wgGroupPermissions[]['noratelimit']. The former still works, however.
 * New $wgGroupPermissions option 'move-subpages' added to control bulk-moving
   subpages along with pages.  Assigned to 'user' and 'sysop' by default.
-* New $wgRC2UDPOmitBots allows user to omit bot edits from UDP output. Default: false
+* New $wgRC2UDPOmitBots allows user to omit bot edits from UDP output. 
+  Default: false
+* Removed $wgEnableCascadingProtection option. Disabling cascading protection
+  is no longer possible. 
 
 === New features in 1.13 ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 748aa5eb61..100965d005 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3149,11 +3149,6 @@ $wgBreakFrames = false;
  */
 $wgDisableQueryPageUpdate = false;
 
-/**
- * Set this to false to disable cascading protection
- */
-$wgEnableCascadingProtection = true;
-
 /**
  * Disable output compression (enabled by default if zlib is available)
  */
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index b77891cf01..931c9e9ee8 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -265,8 +265,7 @@ class ProtectionForm {
 			Xml::openElement( 'table', array( 'id' => 'mw-protect-table2' ) ) .
 			Xml::openElement( 'tbody' );
 
-		global $wgEnableCascadingProtection;
-		if( $wgEnableCascadingProtection && $this->mTitle->exists() ) {
+		if( $this->mTitle->exists() ) {
 			$out .= '<tr>
 					<td></td>
 					<td class="mw-input">' .
diff --git a/includes/Title.php b/includes/Title.php
index 49c0780e7e..dad2bc45cc 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1611,16 +1611,13 @@ class Title {
 	 * The restriction array is an array of each type, each of which contains an array of unique groups
 	 */
 	public function getCascadeProtectionSources( $get_pages = true ) {
-		global $wgEnableCascadingProtection, $wgRestrictionTypes;
+		global $wgRestrictionTypes;
 
 		# Define our dimension of restrictions types
 		$pagerestrictions = array();
 		foreach( $wgRestrictionTypes as $action )
 			$pagerestrictions[$action] = array();
 
-		if (!$wgEnableCascadingProtection)
-			return array( false, $pagerestrictions );
-
 		if ( isset( $this->mCascadeSources ) && $get_pages ) {
 			return array( $this->mCascadeSources, $this->mCascadingRestrictions );
 		} else if ( isset( $this->mHasCascadingRestrictions ) && !$get_pages ) {