Instead of creating an OutputPage and then setting a context start initializing Outpu...

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index e8bfd95..9d85d6c 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -42,7 +42,14 @@ class EditPage {
        const AS_IMAGE_REDIRECT_ANON       = 233;
        const AS_IMAGE_REDIRECT_LOGGED     = 234;
 
+       /**
+        * @var Article
+        */
        var $mArticle;
+
+       /**
+        * @var Title
+        */
        var $mTitle;
        private $mContextTitle = null;
        var $action;
@@ -371,6 +378,8 @@ class EditPage {
                if ( $wgUser->getOption( 'uselivepreview', false ) ) {
                        $wgOut->addModules( 'mediawiki.legacy.preview' );
                }
+               // Bug #19334: textarea jumps when editing articles in IE8
+               $wgOut->addStyle( 'common/IE80Fixes.css', 'screen', 'IE 8' );
 
                $permErrors = $this->getEditPermissionErrors();
                if ( $permErrors ) {
@@ -1347,9 +1356,12 @@ HTML
 
                        // It is better to not parse the comment at all than to have templates expanded in the middle
                        // TODO: can the checkLabel be moved outside of the div so that wrapWikiMsg could be used?
+                       $key = $comment === ''
+                               ? 'confirmrecreate-noreason'
+                               : 'confirmrecreate';
                        $wgOut->addHTML(
                                '<div class="mw-confirm-recreate">' .
-                               wfMsgExt( 'confirmrecreate', 'parseinline', $username, "<nowiki>$comment</nowiki>" ) .
+                               wfMsgExt( $key, 'parseinline', $username, "<nowiki>$comment</nowiki>" ) .
                                Xml::checkLabel( wfMsg( 'recreate' ), 'wpRecreate', 'wpRecreate', false,
                                        array( 'title' => $sk->titleAttrib( 'recreate' ), 'tabindex' => 1, 'id' => 'wpRecreate' )
                                ) .