From 6cd5179d61b36016b2e43cd9d8e7eed3fe42b25c Mon Sep 17 00:00:00 2001
From: Aryeh Gregor ' );
+ $wgOut->addHTML( "
s at the end of each
item. Converted to a proper classed and id'd XHTML list.
---
RELEASE-NOTES | 3 ++-
includes/Parser.php | 4 ++--
includes/SpecialWatchlist.php | 10 +++++-----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4e102b7512..a1d3e03a6f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -244,7 +244,8 @@ lighter making things easier to read.
* (bug 8539) Enable PLURAL option for another message of recentchanges.
* (bug 8728) MediaWiki:Badfiletype splitted into 3 messages
* (bug 9131) Be strict with offset values in SpecialContributions for Postgres
-* (bug 8747) Reformat output of removed entries from watchlist
+* (bug 8747) When unwatching pages from Special:Watchlist/edit, put the
+ confirmation messages in a proper list with a CSS class and id.
* (bug 9155) Allow footer info to wrap in Monobook
== Languages updated ==
diff --git a/includes/Parser.php b/includes/Parser.php
index 14d45bd3de..26e532c42c 100644
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -4562,7 +4562,7 @@ class Parser
.+? # Section title...
\\2 # Ending = count must match start
(?:$comment|<\/?noinclude>|[ \\t]+)* # Trailing whitespace ok
- $
+ \n?
|
\n" );
foreach($id as $one) {
$t = Title::newFromURL( $one );
if( !is_null( $t ) ) {
$wl = WatchedItem::fromUserTitle( $wgUser, $t );
if( $wl->removeWatch() === false ) {
- $wgOut->addHTML( wfMsg( 'couldntremove', htmlspecialchars($one) ) . "
\n" );
+ $wgOut->addHTML( '
' );
+ $wgOut->addHTML( '
\n" );
+ $wgOut->addHTML( '
" . wfMsg( 'wldone' ) . "
\n" ); + $wgOut->addHTML( "\n" . wfMsg( 'wldone' ) . "
\n" ); } $dbr = wfGetDB( DB_SLAVE, 'watchlist' ); -- 2.20.1