Removed $wgEnableCascadingProtection. It was a quite pointless configuration setting...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f19dfad..cb1800b 100644 (file)
--- 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 748aa5e..100965d 100644 (file)
--- 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 b77891c..931c9e9 100644 (file)
--- 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 49c0780..dad2bc4 100644 (file)
--- 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 ) {