Revert r47619 "Add an ID if 'missingsummary' is triggered to allow styling of the...

Invalid HTML -- an element may have only one id value, they're not like classes.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 65743b4..89ad9bb 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -116,8 +116,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Special:ListUsers: Sort list of usergroups by alphabet
 * (bug 16762) Special:Movepage now shows a list of subpages when possible
 * (bug 17585) Hide legend on Special:Specialpages from non-privileged users
-* Add an ID if 'missingsummary' is triggered to allow styling of the summary
-  line
+
 * Added $wgUseTagFilter to control enabling of filter-by-change-tag
 * (bug 17291) MediaWiki:Nocontribs now has an optional $1 parameter for the
   username

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 2fedb42..51010c2 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1363,13 +1363,10 @@ class EditPage {
                if ( $this->section == 'new' ) {
                        $commentsubject = '';
                        if ( !$wgRequest->getBool( 'nosummary' ) ) {
-                               # Add an ID if 'missingsummary' is triggered to allow styling of the summary line
-                               $summaryMissedID = $this->missingSummary ? ' mw-summarymissed' : '';
-
                                $commentsubject =
                                        Xml::tags( 'label', array( 'for' => 'wpSummary' ), $subject );
                                $commentsubject =
-                                       Xml::tags( 'span', array( 'id' => "wpSummaryLabel$summaryMissedID" ), $commentsubject );
+                                       Xml::tags( 'span', array( 'id' => 'wpSummaryLabel' ), $commentsubject );
                                $commentsubject .= ' ';
                                $commentsubject .= Xml::input( 'wpSummary',
                                                                        60,
@@ -1388,12 +1385,10 @@ class EditPage {
                } else {
                        $commentsubject = '';
 
-                       # Add an ID if 'missingsummary' is triggered to allow styling of the summary line
-                       $summaryMissedID = $this->missingSummary ? ' mw-summarymissed' : '';
-
                        $editsummary = Xml::tags( 'label', array( 'for' => 'wpSummary' ), $summary );
-                       $editsummary = Xml::tags( 'span', array( 'id' => "wpSummaryLabel$summaryMissedID" ), $editsummary ) . ' ';
-
+                       $editsummary =
+                               Xml::tags( 'span', array( 'id' => 'wpSummaryLabel' ), $editsummary ) . ' ';
+                               
                        $editsummary .= Xml::input( 'wpSummary',
                                60,
                                $summarytext,
@@ -1402,11 +1397,11 @@ class EditPage {
                                        'maxlength' => '200',
                                        'tabindex' => '1'
                                ) );
-
+                       
                        // No idea where this is closed.
                        $editsummary = Xml::openElement( 'div', array( 'class' => 'editOptions' ) )
                                                        . $editsummary . '<br/>';
-
+                               
                        $summarypreview = '';
                        if ( $summarytext && $this->preview ) {
                                $summarypreview =