Backing off fix for bug 10836 - previous attempt was incomplete. Will revisit later.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1be8306..cbb3fdf 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -429,7 +429,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 8393) <sup> and <sub> need to be preserved (without attributes) for
   entries in the table of contents
 * (bug 11114) Fix regression in read-only mode error display during editing
-* (bug 10836) Change the summary on creating of new section
 
 == API changes since 1.10 ==
 

diff --git a/includes/Article.php b/includes/Article.php
index 9d2909f..8746d5e 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1160,7 +1160,7 @@ class Article {
        /**
         * @return string Complete article text, or null if error
         */
-       function replaceSection($section, $text, &$summary = '', $edittime = NULL) {
+       function replaceSection($section, $text, $summary = '', $edittime = NULL) {
                wfProfileIn( __METHOD__ );
 
                if( $section == '' ) {
@@ -1182,8 +1182,6 @@ class Article {
                        if( $section == 'new' ) {
                                # Inserting a new section
                                $subject = $summary ? wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n" : '';
-                               # Heading has been added to text, now wrap comment for RC linking to heading
-                               $summary = "/* {$summary} */";
                                $text = strlen( trim( $oldtext ) ) > 0
                                                ? "{$oldtext}\n\n{$subject}{$text}"
                                                : "{$subject}{$text}";
@@ -1202,7 +1200,7 @@ class Article {
        /**
         * @deprecated use Article::doEdit()
         */
-       function insertNewArticle( $text, &$summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
+       function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
                $flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
                        ( $isminor ? EDIT_MINOR : 0 ) |
                        ( $suppressRC ? EDIT_SUPPRESS_RC : 0 );
@@ -1210,8 +1208,6 @@ class Article {
                # If this is a comment, add the summary as headline
                if ( $comment && $summary != "" ) {
                        $text = wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n".$text;
-                       # Heading has been added to text, now wrap comment for RC linking to heading
-                       $summary = "/* {$summary} */";
                }
 
                $this->doEdit( $text, $summary, $flags );