Fix #6015: dd spacing in the boxes "edit is minor" and "watch this"

Patch by Rotem Liss <mail@rotemliss.com>

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8f775fe..69be18e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -301,6 +301,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6017) Update list of bookstores in German localisation files
 * (bug 5187) Allow programmatically bypassing username validation, for scripts
 * (bug 6025) SpecialImport: wrong message when no file selected
+* (bug 6015) EditPage: add spacing in the boxes "edit is minor" and "watch this"
 
 == Compatibility ==
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 2cd38d7..d775cab 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -893,8 +893,8 @@ class EditPage {
                if ( $wgUser->isAllowed('minoredit') ) {
                        $minoredithtml =
                                "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked='checked'":"").
-                               " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />".
-                               "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>";
+                               " accesskey='".wfMsg('accesskey-minoredit')."' id='wpMinoredit' />\n".
+                               "<label for='wpMinoredit' title='".wfMsg('tooltip-minoredit')."'>{$minor}</label>\n";
                }
 
                $watchhtml = '';
@@ -902,9 +902,9 @@ class EditPage {
                if ( $wgUser->isLoggedIn() ) {
                        $watchhtml = "<input tabindex='4' type='checkbox' name='wpWatchthis'".
                                ($this->watchthis?" checked='checked'":"").
-                               " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis'  />".
+                               " accesskey=\"".htmlspecialchars(wfMsg('accesskey-watch'))."\" id='wpWatchthis'  />\n".
                                "<label for='wpWatchthis' title=\"" .
-                                       htmlspecialchars(wfMsg('tooltip-watch'))."\">{$watchthis}</label>";
+                                       htmlspecialchars(wfMsg('tooltip-watch'))."\">{$watchthis}</label>\n";
                }
 
                $checkboxhtml = $minoredithtml . $watchhtml;
@@ -927,11 +927,11 @@ class EditPage {
                # Otherwise, show a summary field at the bottom
                $summarytext = htmlspecialchars( $wgContLang->recodeForEdit( $this->summary ) ); # FIXME
                if( $this->section == 'new' ) {
-                       $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span> <div class='editOptions'><input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
+                       $commentsubject="<span id='wpSummaryLabel'><label for='wpSummary'>{$subject}:</label></span>\n<div class='editOptions'>\n<input tabindex='1' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
                        $editsummary = '';
                } else {
                        $commentsubject = '';
-                       $editsummary="<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span> <div class='editOptions'><input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
+                       $editsummary="<span id='wpSummaryLabel'><label for='wpSummary'>{$summary}:</label></span>\n<div class='editOptions'>\n<input tabindex='2' type='text' value=\"$summarytext\" name='wpSummary' id='wpSummary' maxlength='200' size='60' /><br />";
                }
 
                # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display
@@ -1066,8 +1066,8 @@ END
 {$safemodehtml}
 ");
 
-               $wgOut->addHTML("
-<div class='editButtons'>
+               $wgOut->addHTML(
+"<div class='editButtons'>
        {$buttons['save']}
        {$buttons['preview']}
        {$buttons['live']}