From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Dec 2013 09:55:49 +0100 Subject: Update to MediaWiki 1.22.0 --- includes/api/ApiSetNotificationTimestamp.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'includes/api/ApiSetNotificationTimestamp.php') diff --git a/includes/api/ApiSetNotificationTimestamp.php b/includes/api/ApiSetNotificationTimestamp.php index 58d5d9ab..53a68fde 100644 --- a/includes/api/ApiSetNotificationTimestamp.php +++ b/includes/api/ApiSetNotificationTimestamp.php @@ -39,6 +39,9 @@ class ApiSetNotificationTimestamp extends ApiBase { if ( $user->isAnon() ) { $this->dieUsage( 'Anonymous users cannot use watchlist change notifications', 'notloggedin' ); } + if ( !$user->isAllowed( 'editmywatchlist' ) ) { + $this->dieUsage( 'You don\'t have permission to edit your watchlist', 'permissiondenied' ); + } $params = $this->extractRequestParams(); $this->requireMaxOneParameter( $params, 'timestamp', 'torevid', 'newerthanrevid' ); @@ -212,7 +215,7 @@ class ApiSetNotificationTimestamp extends ApiBase { } public function getParamDescription() { - return $this->getPageSet()->getParamDescription() + array( + return $this->getPageSet()->getFinalParamDescription() + array( 'entirewatchlist' => 'Work on all watched pages', 'timestamp' => 'Timestamp to which to set the notification timestamp', 'torevid' => 'Revision to set the notification timestamp to (one page only)', @@ -270,7 +273,7 @@ class ApiSetNotificationTimestamp extends ApiBase { $ps = $this->getPageSet(); return array_merge( parent::getPossibleErrors(), - $ps->getPossibleErrors(), + $ps->getFinalPossibleErrors(), $this->getRequireMaxOneParameterErrorMessages( array( 'timestamp', 'torevid', 'newerthanrevid' ) ), $this->getRequireOnlyOneParameterErrorMessages( -- cgit v1.2.3-54-g00ecf