Merge "LivePreview: Wrap content preview with mw-content-*"

diff --combined includes/EditPage.php
index 6789259,0d5e63c..a8a17cf
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -534,9 -534,7 +534,9 @@@ class EditPage 
                # in the back door with a hand-edited submission URL.
  
                if ( 'save' == $this->formtype ) {
 -                      if ( !$this->attemptSave() ) {
 +                      $resultDetails = null;
 +                      $status = $this->attemptSave( $resultDetails );
 +                      if ( !$this->handleStatus( $status, $resultDetails ) ) {
                                return;
                        }
                }
@@@ -1286,20 -1284,18 +1286,20 @@@
  
        /**
         * Attempt submission
 +       * @param array $resultDetails See docs for $result in internalAttemptSave
         * @throws UserBlockedError|ReadOnlyError|ThrottledError|PermissionsError
 -       * @return bool False if output is done, true if the rest of the form should be displayed
 +       * @return Status The resulting status object.
         */
 -      public function attemptSave() {
 +      public function attemptSave( &$resultDetails = false ) {
                global $wgUser;
  
 -              $resultDetails = false;
                # Allow bots to exempt some edits from bot flagging
                $bot = $wgUser->isAllowed( 'bot' ) && $this->bot;
                $status = $this->internalAttemptSave( $resultDetails, $bot );
  
 -              return $this->handleStatus( $status, $resultDetails );
 +              Hooks::run( 'EditPage::attemptSave:after', array( $this, $status, $resultDetails ) );
 +
 +              return $status;
        }
  
        /**
@@@ -2996,6 -2992,12 +2996,12 @@@ HTM
  
                if ( $this->formtype == 'preview' ) {
                        $this->showPreview( $previewOutput );
+               } else {
+                       // Empty content container for LivePreview
+                       $pageViewLang = $this->mTitle->getPageViewLanguage();
+                       $attribs = array( 'lang' => $pageViewLang->getHtmlCode(), 'dir' => $pageViewLang->getDir(),
+                               'class' => 'mw-content-' . $pageViewLang->getDir() );
+                       $wgOut->addHTML( Html::rawElement( 'div', $attribs ) );
                }
  
                $wgOut->addHTML( '</div>' );