Merge "Unbreak cascading protection"

diff --combined includes/WikiPage.php
index 1a46b3e,910aeae..69baff1
--- 1/includes/WikiPage.php
--- 2/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@@ -2071,9 -2071,7 +2071,9 @@@ class WikiPage implements Page, IDBAcce
  
                // Update the links tables and other secondary data
                if ( $content ) {
 -                      $updates = $content->getSecondaryDataUpdates( $this->getTitle(), null, true, $editInfo->output );
 +                      $recursive = $options['changed']; // bug 50785
 +                      $updates = $content->getSecondaryDataUpdates(
 +                              $this->getTitle(), null, $recursive, $editInfo->output );
                        DataUpdate::runUpdates( $updates );
                }
  
@@@ -2348,6 -2346,12 +2348,12 @@@
                        // Only certain restrictions can cascade... Otherwise, users who cannot normally protect pages
                        // could "protect" them by transcluding them on protected pages they are allowed to edit.
                        $editrestriction = isset( $limit['edit'] ) ? array( $limit['edit'] ) : $this->mTitle->getRestrictions( 'edit' );
+                       foreach ( array_keys( $editrestriction, 'sysop' ) as $key ) {
+                               $editrestriction[$key] = 'editprotected'; // backwards compatibility
+                       }
+                       foreach ( array_keys( $editrestriction, 'autoconfirmed' ) as $key ) {
+                               $editrestriction[$key] = 'editsemiprotected'; // backwards compatibility
+                       }
  
                        $cascadingRestrictionLevels = $wgCascadingRestrictionLevels;
                        foreach ( array_keys( $cascadingRestrictionLevels, 'sysop' ) as $key ) {