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/mail/EmailNotification.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'includes/mail/EmailNotification.php') diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php index 8215403e..81c4e38d 100644 --- a/includes/mail/EmailNotification.php +++ b/includes/mail/EmailNotification.php @@ -205,8 +205,6 @@ class EmailNotification { global $wgEnotifWatchlist; global $wgEnotifMinorEdits, $wgEnotifUserTalk; - wfProfileIn( __METHOD__ ); - # The following code is only run, if several conditions are met: # 1. EmailNotification for pages (other than user_talk pages) must be enabled # 2. minor edits (changes) are only regarded if the global flag indicates so @@ -224,9 +222,8 @@ class EmailNotification { $formattedPageStatus = array( 'deleted', 'created', 'moved', 'restored', 'changed' ); - wfRunHooks( 'UpdateUserMailerFormattedPageStatus', array( &$formattedPageStatus ) ); + Hooks::run( 'UpdateUserMailerFormattedPageStatus', array( &$formattedPageStatus ) ); if ( !in_array( $this->pageStatus, $formattedPageStatus ) ) { - wfProfileOut( __METHOD__ ); throw new MWException( 'Not a valid page status!' ); } @@ -251,7 +248,7 @@ class EmailNotification { && $watchingUser->isEmailConfirmed() && $watchingUser->getID() != $userTalkId ) { - if ( wfRunHooks( 'SendWatchlistEmailNotification', array( $watchingUser, $title, $this ) ) ) { + if ( Hooks::run( 'SendWatchlistEmailNotification', array( $watchingUser, $title, $this ) ) ) { $this->compose( $watchingUser ); } } @@ -270,7 +267,6 @@ class EmailNotification { } $this->sendMails(); - wfProfileOut( __METHOD__ ); } /** @@ -295,7 +291,7 @@ class EmailNotification { ) { if ( !$targetUser->isEmailConfirmed() ) { wfDebug( __METHOD__ . ": talk page owner doesn't have validated email\n" ); - } elseif ( !wfRunHooks( 'AbortTalkPageEmailNotification', array( $targetUser, $title ) ) ) { + } elseif ( !Hooks::run( 'AbortTalkPageEmailNotification', array( $targetUser, $title ) ) ) { wfDebug( __METHOD__ . ": talk page update notification is aborted for this user\n" ); } else { wfDebug( __METHOD__ . ": sending talk page update notification\n" ); -- cgit v1.2.2