| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -265,8 +265,7 @@ |
| 266 | 266 | Xml::openElement( 'table', array( 'id' => 'mw-protect-table2' ) ) . |
| 267 | 267 | Xml::openElement( 'tbody' ); |
| 268 | 268 | |
| 269 | | - global $wgEnableCascadingProtection; |
| 270 | | - if( $wgEnableCascadingProtection && $this->mTitle->exists() ) { |
| | 269 | + if( $this->mTitle->exists() ) { |
| 271 | 270 | $out .= '<tr> |
| 272 | 271 | <td></td> |
| 273 | 272 | <td class="mw-input">' . |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1611,16 +1611,13 @@ |
| 1612 | 1612 | * The restriction array is an array of each type, each of which contains an array of unique groups |
| 1613 | 1613 | */ |
| 1614 | 1614 | public function getCascadeProtectionSources( $get_pages = true ) { |
| 1615 | | - global $wgEnableCascadingProtection, $wgRestrictionTypes; |
| | 1615 | + global $wgRestrictionTypes; |
| 1616 | 1616 | |
| 1617 | 1617 | # Define our dimension of restrictions types |
| 1618 | 1618 | $pagerestrictions = array(); |
| 1619 | 1619 | foreach( $wgRestrictionTypes as $action ) |
| 1620 | 1620 | $pagerestrictions[$action] = array(); |
| 1621 | 1621 | |
| 1622 | | - if (!$wgEnableCascadingProtection) |
| 1623 | | - return array( false, $pagerestrictions ); |
| 1624 | | - |
| 1625 | 1622 | if ( isset( $this->mCascadeSources ) && $get_pages ) { |
| 1626 | 1623 | return array( $this->mCascadeSources, $this->mCascadingRestrictions ); |
| 1627 | 1624 | } else if ( isset( $this->mHasCascadingRestrictions ) && !$get_pages ) { |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3150,11 +3150,6 @@ |
| 3151 | 3151 | $wgDisableQueryPageUpdate = false; |
| 3152 | 3152 | |
| 3153 | 3153 | /** |
| 3154 | | - * Set this to false to disable cascading protection |
| 3155 | | - */ |
| 3156 | | -$wgEnableCascadingProtection = true; |
| 3157 | | - |
| 3158 | | -/** |
| 3159 | 3154 | * Disable output compression (enabled by default if zlib is available) |
| 3160 | 3155 | */ |
| 3161 | 3156 | $wgDisableOutputCompression = false; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -56,7 +56,10 @@ |
| 57 | 57 | $wgGroupPermissions[]['noratelimit']. The former still works, however. |
| 58 | 58 | * New $wgGroupPermissions option 'move-subpages' added to control bulk-moving |
| 59 | 59 | subpages along with pages. Assigned to 'user' and 'sysop' by default. |
| 60 | | -* New $wgRC2UDPOmitBots allows user to omit bot edits from UDP output. Default: false |
| | 60 | +* New $wgRC2UDPOmitBots allows user to omit bot edits from UDP output. |
| | 61 | + Default: false |
| | 62 | +* Removed $wgEnableCascadingProtection option. Disabling cascading protection |
| | 63 | + is no longer possible. |
| 61 | 64 | |
| 62 | 65 | === New features in 1.13 === |
| 63 | 66 | |