dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "CommentStore: Hard-deprecate newKey()"
[lhc/web/wiklou.git]
/
includes
/
actions
/
WatchAction.php
diff --git
a/includes/actions/WatchAction.php
b/includes/actions/WatchAction.php
index
e12a727
..
aaccc0c
100644
(file)
--- a/
includes/actions/WatchAction.php
+++ b/
includes/actions/WatchAction.php
@@
-40,9
+40,7
@@
class WatchAction extends FormAction {
}
public function onSubmit( $data ) {
}
public function onSubmit( $data ) {
- self::doWatch( $this->getTitle(), $this->getUser() );
-
- return true;
+ return self::doWatch( $this->getTitle(), $this->getUser() );
}
protected function checkCanExecute( User $user ) {
}
protected function checkCanExecute( User $user ) {
@@
-80,8
+78,6
@@
class WatchAction extends FormAction {
$this->getOutput()->addWikiMsg( $msgKey, $this->getTitle()->getPrefixedText() );
}
$this->getOutput()->addWikiMsg( $msgKey, $this->getTitle()->getPrefixedText() );
}
- /* Static utility methods */
-
/**
* Watch or unwatch a page
* @since 1.22
/**
* Watch or unwatch a page
* @since 1.22
@@
-185,8
+181,10
@@
class WatchAction extends FormAction {
* @param string $action Optionally override the action to 'watch'
* @return string Token
* @since 1.18
* @param string $action Optionally override the action to 'watch'
* @return string Token
* @since 1.18
+ * @deprecated since 1.32 Use WatchAction::getWatchToken() with action 'unwatch' directly.
*/
public static function getUnwatchToken( Title $title, User $user, $action = 'unwatch' ) {
*/
public static function getUnwatchToken( Title $title, User $user, $action = 'unwatch' ) {
+ wfDeprecated( __METHOD__, '1.32' );
return self::getWatchToken( $title, $user, $action );
}
return self::getWatchToken( $title, $user, $action );
}