X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialWatchlist.php;h=5691e50608d5cfbe5978cab8b42734b20ba75fc4;hb=f558da101e0bc6f0a97e6a68f200e5f24898a8b5;hp=57659e7289eb4cca89c97e2ba20b7fd745e7d113;hpb=96484126651b7f2550df5a8cc4a998d19b27b73c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 57659e7289..5691e50608 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -83,7 +83,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 	 * Return an array of subpages beginning with $search that this special page will accept.
 	 *
 	 * @param string $search Prefix to search for
-	 * @param integer $limit Maximum number of results to return
+	 * @param int $limit Maximum number of results to return
 	 * @return string[] Matching subpages
 	 */
 	public function prefixSearchSubpages( $search, $limit = 10 ) {
@@ -258,7 +258,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		// the necessary rights.
 		if ( !$user->isAllowed( 'deletedhistory' ) ) {
 			$bitmask = LogPage::DELETED_ACTION;
-		} elseif ( !$user->isAllowed( 'suppressrevision' ) ) {
+		} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
 			$bitmask = LogPage::DELETED_ACTION | LogPage::DELETED_RESTRICTED;
 		} else {
 			$bitmask = 0;
@@ -279,9 +279,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 			''
 		);
 
-		wfRunHooks( 'SpecialWatchlistQuery',
-			array( &$conds, &$tables, &$join_conds, &$fields, $opts ),
-			'1.23' );
+		$this->runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts );
 
 		return $dbr->select(
 			$tables,
@@ -293,6 +291,15 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		);
 	}
 
+	protected function runMainQueryHook( &$tables, &$fields, &$conds, &$query_options, &$join_conds, $opts ) {
+		return parent::runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts )
+			&& wfRunHooks(
+				'SpecialWatchlistQuery',
+				array( &$conds, &$tables, &$join_conds, &$fields, $opts ),
+				'1.23'
+			);
+	}
+
 	/**
 	 * Return a DatabaseBase object for reading
 	 *
@@ -391,8 +398,9 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 	 * Set the text to be displayed above the changes
 	 *
 	 * @param FormOptions $opts
+	 * @param int $numRows Number of rows in the result to show after this header
 	 */
-	public function doHeader( $opts ) {
+	public function doHeader( $opts, $numRows ) {
 		$user = $this->getUser();
 
 		$this->getOutput()->addSubtitle(
@@ -406,7 +414,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		$wlInfo = '';
 		if ( $opts['days'] > 0 ) {
 			$timestamp = wfTimestampNow();
-			$wlInfo = $this->msg( 'wlnote2' )->numParams( round( $opts['days'] * 24 ) )->params(
+			$wlInfo = $this->msg( 'wlnote' )->numParams( $numRows, round( $opts['days'] * 24 ) )->params(
 				$lang->userDate( $timestamp, $user ), $lang->userTime( $timestamp, $user )
 			)->parse() . "<br />\n";
 		}