cyberes
/
ProtectedContactPage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove use of deprecated wfRunHooks"

This commit is contained in:
jenkins-bot 2015-08-06 18:46:15 +00:00 committed by Gerrit Code Review
parent 4699d68b37 56a2a82c0f
commit bbdb58b5f7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ContactPage_body.php
View File

@ -223,7 +223,7 @@ class SpecialContact extends UnlistedSpecialPage {
$form->loadData();
// Stolen from Special:EmailUser
if ( !wfRunHooks( 'EmailUserForm', array( &$form ) ) ) {
if ( !Hooks::run( 'EmailUserForm', array( &$form ) ) ) {
return;
}
@ -407,11 +407,11 @@ class SpecialContact extends UnlistedSpecialPage {
// Stolen from Special:EmailUser
$error = '';
if ( !wfRunHooks( 'EmailUser', array( &$contactRecipientAddress, &$senderAddress, &$subject, &$text, &$error ) ) ) {
if ( !Hooks::run( 'EmailUser', array( &$contactRecipientAddress, &$senderAddress, &$subject, &$text, &$error ) ) ) {
return $error;
}
if( !wfRunHooks( 'ContactForm', array( &$contactRecipientAddress, &$replyTo, &$subject, &$text, $this->formType, $formData ) ) ) {
if( !Hooks::run( 'ContactForm', array( &$contactRecipientAddress, &$replyTo, &$subject, &$text, $this->formType, $formData ) ) ) {
return false; // TODO: Need to do some proper error handling here
}
@ -430,7 +430,7 @@ class SpecialContact extends UnlistedSpecialPage {
// unless they are emailing themselves, in which case one copy of the message is sufficient.
if( $formData['CCme'] && $fromAddress ) {
$cc_subject = wfMessage( 'emailccsubject', $contactRecipientUser->getName(), $subject )->text();
if( wfRunHooks( 'ContactForm',
if( Hooks::run( 'ContactForm',
array( &$senderAddress, &$contactSender, &$cc_subject, &$text, $this->formType, $formData ) )
) {
wfDebug( __METHOD__ . ': sending cc mail from ' . $contactSender->toString() .
@ -448,7 +448,7 @@ class SpecialContact extends UnlistedSpecialPage {
}
}
wfRunHooks( 'ContactFromComplete', array( $contactRecipientAddress, $replyTo, $subject, $text ) );
Hooks::run( 'ContactFromComplete', array( $contactRecipientAddress, $replyTo, $subject, $text ) );
return true;
}