From: Mark A. Hershberger <mah@everybody.org>
Date: Mon, 9 Apr 2012 15:07:34 +0000 (-0400)
Subject: Bug 35601 — Watchlist doesn't show or count pages not in the main
X-Git-Tag: 1.31.0-rc.0~23959
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=d8e2e3c17ad69be7b763fe859ed5af0d22816170;p=lhc%2Fweb%2Fwiklou.git

Bug 35601 — Watchlist doesn't show or count pages not in the main
namespace when deleting them from the watchlist

Fix with array_merge.

Change-Id: I8055467a018f6eee6d55419576648e5a5fac0632
---

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 296c98f2c3..fa483178ad 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -273,7 +273,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 *
 	 * @param Title $title
 	 * @param int $namespace
-	 * @param String $dbKey 
+	 * @param String $dbKey
 	 * @return bool: Whether this item is valid
 	 */
 	private function checkTitle( $title, $namespace, $dbKey ) {
@@ -409,7 +409,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 
 		foreach( $data as $titles ) {
 			$this->unwatchTitles( $titles );
-			$removed += $titles;
+			$removed = array_merge( $removed, $titles );
 		}
 
 		if( count( $removed ) > 0 ) {