(Bug 3690) Allowed wikitext in previewnote, moved <strong> to notice

diff --git a/includes/EditPage.php b/includes/EditPage.php
index b233bb9..7a22527 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -981,10 +981,9 @@ END
                wfProfileIn( $fname );
 
                $previewhead = '<h2>' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>\n" .
-                       "<p class='previewnote'><strong>" . htmlspecialchars( wfMsg( 'previewnote' ) ) . "</strong></p>\n";
+                       "<div class='previewnote'>" . $wgOut->parse( wfMsg( 'previewnote' ) ) . "</div>\n";
                if ( $this->isConflict ) {
-                       $previewhead.='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) .
-                               "</h2>\n";
+                       $previewhead.='<h2>' . htmlspecialchars( wfMsg( 'previewconflict' ) ) . "</h2>\n";
                }
 
                $parserOptions = ParserOptions::newFromUser( $wgUser );

diff --git a/languages/Language.php b/languages/Language.php
index 86d610d..8df507d 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -717,7 +717,7 @@ If you are here by mistake, just click your browser's '''back''' button.",
 'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''",
 'updated'              => '(Updated)',
 'note'                 => '<strong>Note:</strong> ',
-'previewnote'  => 'This is only a preview, changes have not yet been saved!',
+'previewnote'  => '<strong>This is only a preview; changes have not yet been saved!</strong>',
 'previewconflict' => 'This preview reflects the text in the upper
 text editing area as it will appear if you choose to save.',
 'editing'              => "Editing $1",

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index e79a71c..227f918 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -1178,6 +1178,11 @@ span.changedby {
   margin-bottom: 1em;
 }
 
+.previewnote p {
+  margin: 0;
+  padding: 0;
+}
+
 .editExternally {
        border: 1px solid gray;
        background-color: #ffffff;