r25400 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r25399‎ | r25400 | r25401 >
Date:02:50, 2 September 2007
Author:tlaqua
Status:old
Tags:
Comment:
Backing off fix for bug 10836 - previous attempt was incomplete. Will revisit later.
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/Article.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Article.php
@@ -1160,7 +1160,7 @@
11611161 /**
11621162 * @return string Complete article text, or null if error
11631163 */
1164 - function replaceSection($section, $text, &$summary = '', $edittime = NULL) {
 1164+ function replaceSection($section, $text, $summary = '', $edittime = NULL) {
11651165 wfProfileIn( __METHOD__ );
11661166
11671167 if( $section == '' ) {
@@ -1182,8 +1182,6 @@
11831183 if( $section == 'new' ) {
11841184 # Inserting a new section
11851185 $subject = $summary ? wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n" : '';
1186 - # Heading has been added to text, now wrap comment for RC linking to heading
1187 - $summary = "/* {$summary} */";
11881186 $text = strlen( trim( $oldtext ) ) > 0
11891187 ? "{$oldtext}\n\n{$subject}{$text}"
11901188 : "{$subject}{$text}";
@@ -1202,7 +1200,7 @@
12031201 /**
12041202 * @deprecated use Article::doEdit()
12051203 */
1206 - function insertNewArticle( $text, &$summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
 1204+ function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC=false, $comment=false ) {
12071205 $flags = EDIT_NEW | EDIT_DEFER_UPDATES | EDIT_AUTOSUMMARY |
12081206 ( $isminor ? EDIT_MINOR : 0 ) |
12091207 ( $suppressRC ? EDIT_SUPPRESS_RC : 0 );
@@ -1210,8 +1208,6 @@
12111209 # If this is a comment, add the summary as headline
12121210 if ( $comment && $summary != "" ) {
12131211 $text = wfMsgForContent('newsectionheaderdefaultlevel',$summary) . "\n\n".$text;
1214 - # Heading has been added to text, now wrap comment for RC linking to heading
1215 - $summary = "/* {$summary} */";
12161212 }
12171213
12181214 $this->doEdit( $text, $summary, $flags );
Index: trunk/phase3/RELEASE-NOTES
@@ -429,7 +429,6 @@
430430 * (bug 8393) <sup> and <sub> need to be preserved (without attributes) for
431431 entries in the table of contents
432432 * (bug 11114) Fix regression in read-only mode error display during editing
433 -* (bug 10836) Change the summary on creating of new section
434433
435434 == API changes since 1.10 ==
436435

Follow-up revisions

RevisionCommit summaryAuthorDate
r25415Merged revisions 25372-25414 via svnmerge from...david21:15, 2 September 2007
r25445Fixed bug 10836...tlaqua17:46, 3 September 2007
r25454Merged revisions 25415-25453 via svnmerge from...david19:27, 3 September 2007
r25573Refining fix for bug 10836 - taking care of unintended behavior....tlaqua04:11, 6 September 2007
r25607Merged revisions 25530-25606 via svnmerge from...david06:11, 7 September 2007

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r25398Fixed bug 10836...tlaqua01:41, 2 September 2007

Status & tagging log