API: (bug 17563) Fix regression from r46845 that changed the output for list=backlink...

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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 1f311c1..b1d8b48 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1344,7 +1344,7 @@ class EditPage {
                        $commentsubject = '';
                        if ( !$wgRequest->getBool( 'nosummary' ) ) {
                                $commentsubject =
-                                       Xml::element( 'label', array( 'for' => 'wpSummary' ), $subject );
+                                       Xml::tags( 'label', array( 'for' => 'wpSummary' ), $subject );
                                $commentsubject =
                                        Xml::tags( 'span', array( 'id' => 'wpSummaryLabel' ), $commentsubject );
                                $commentsubject .= ' ';
@@ -1365,9 +1365,9 @@ class EditPage {
                } else {
                        $commentsubject = '';
 
-                       $editsummary = Xml::element( 'label', array( 'for' => 'wpSummary' ), $summary );
+                       $editsummary = Xml::tags( 'label', array( 'for' => 'wpSummary' ), $summary );
                        $editsummary =
-                               Xml::tags( 'span', array( 'id' => 'wpSummaryLabel' ), $editsummary );
+                               Xml::tags( 'span', array( 'id' => 'wpSummaryLabel' ), $editsummary ) . ' ';
                                
                        $editsummary .= Xml::input( 'wpSummary',
                                60,
@@ -1393,6 +1393,7 @@ class EditPage {
                        }
                        $subjectpreview = '';
                }
+               $commentsubject .= $summaryhiddens;
 
                # Set focus to the edit box on load, except on preview or diff, where it would interfere with the display
                if ( !$this->preview && !$this->diff ) {