Merge "Use preview content when it transcludes itself"

diff --combined includes/EditPage.php
index 7f5a9c0,b65668e..4370295
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -1928,15 -1928,11 +1928,15 @@@ class EditPage 
                        && $content->isRedirect()
                        && $content->getRedirectTarget()->equals( $this->getTitle() )
                ) {
 -                      $this->selfRedirect = true;
 -                      $status->fatal( 'selfredirect' );
 -                      $status->value = self::AS_SELF_REDIRECT;
 -                      wfProfileOut( __METHOD__ );
 -                      return $status;
 +                      // If the page already redirects to itself, don't warn.
 +                      $currentTarget = $this->getCurrentContent()->getRedirectTarget();
 +                      if ( !$currentTarget || !$currentTarget->equals( $this->getTitle() ) ) {
 +                              $this->selfRedirect = true;
 +                              $status->fatal( 'selfredirect' );
 +                              $status->value = self::AS_SELF_REDIRECT;
 +                              wfProfileOut( __METHOD__ );
 +                              return $status;
 +                      }
                }
  
                // Check for length errors again now that the section is merged in
@@@ -2118,19 -2114,11 +2118,19 @@@
                $wgOut->addModules( 'mediawiki.action.edit' );
                $wgOut->addModuleStyles( 'mediawiki.action.edit.styles' );
  
 -              if ( $wgUser->getOption( 'uselivepreview', false ) ) {
 +              if ( $wgUser->getOption( 'showtoolbar' ) ) {
 +                      // The addition of default buttons is handled by getEditToolbar() which
 +                      // has its own dependency on this module. The call here ensures the module
 +                      // is loaded in time (it has position "top") for other modules to register
 +                      // buttons (e.g. extensions, gadgets, user scripts).
 +                      $wgOut->addModules( 'mediawiki.toolbar' );
 +              }
 +
 +              if ( $wgUser->getOption( 'uselivepreview' ) ) {
                        $wgOut->addModules( 'mediawiki.action.edit.preview' );
                }
  
 -              if ( $wgUser->getOption( 'useeditwarning', false ) ) {
 +              if ( $wgUser->getOption( 'useeditwarning' ) ) {
                        $wgOut->addModules( 'mediawiki.action.edit.editWarning' );
                }
  
@@@ -3573,6 -3561,8 +3573,8 @@@ HTM
                        # But it's now deprecated, so never mind
  
                        $pstContent = $content->preSaveTransform( $this->mTitle, $wgUser, $parserOptions );
+                       $scopedCallback = $parserOptions->setupFakeRevision(
+                               $this->mTitle, $pstContent, $wgUser );
                        $parserOutput = $pstContent->getParserOutput( $this->mTitle, null, $parserOptions );
  
                        # Try to stash the edit for the final submission step
@@@ -3755,11 -3745,7 +3757,11 @@@
                                $tool['id'],
                        );
  
 -                      $script .= Xml::encodeJsCall( 'mw.toolbar.addButton', $params );
 +                      $script .= Xml::encodeJsCall(
 +                              'mw.toolbar.addButton',
 +                              $params,
 +                              ResourceLoader::inDebugMode()
 +                      );
                }
  
                $script .= '});';