From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/actions/WatchAction.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'includes/actions/WatchAction.php') diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php index 8c9a46a5..96473409 100644 --- a/includes/actions/WatchAction.php +++ b/includes/actions/WatchAction.php @@ -48,9 +48,7 @@ class WatchAction extends FormAction { } public function onSubmit( $data ) { - wfProfileIn( __METHOD__ ); self::doWatch( $this->getTitle(), $this->getUser() ); - wfProfileOut( __METHOD__ ); return true; } @@ -132,10 +130,10 @@ class WatchAction extends FormAction { $page = WikiPage::factory( $title ); $status = Status::newFatal( 'hookaborted' ); - if ( wfRunHooks( 'WatchArticle', array( &$user, &$page, &$status ) ) ) { + if ( Hooks::run( 'WatchArticle', array( &$user, &$page, &$status ) ) ) { $status = Status::newGood(); $user->addWatch( $title, $checkRights ); - wfRunHooks( 'WatchArticleComplete', array( &$user, &$page ) ); + Hooks::run( 'WatchArticleComplete', array( &$user, &$page ) ); } return $status; @@ -156,10 +154,10 @@ class WatchAction extends FormAction { $page = WikiPage::factory( $title ); $status = Status::newFatal( 'hookaborted' ); - if ( wfRunHooks( 'UnwatchArticle', array( &$user, &$page, &$status ) ) ) { + if ( Hooks::run( 'UnwatchArticle', array( &$user, &$page, &$status ) ) ) { $status = Status::newGood(); $user->removeWatch( $title ); - wfRunHooks( 'UnwatchArticleComplete', array( &$user, &$page ) ); + Hooks::run( 'UnwatchArticleComplete', array( &$user, &$page ) ); } return $status; -- cgit v1.2.3-54-g00ecf