dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f31ae4
)
Unbreak sending emails using mailTargets() in safe_mode
author
Max Semenik
<maxsem@users.mediawiki.org>
Mon, 10 Oct 2011 17:41:22 +0000
(17:41 +0000)
committer
Max Semenik
<maxsem@users.mediawiki.org>
Mon, 10 Oct 2011 17:41:22 +0000
(17:41 +0000)
includes/UserMailer.php
patch
|
blob
|
history
diff --git
a/includes/UserMailer.php
b/includes/UserMailer.php
index
d95a5c5
..
649fa20
100644
(file)
--- a/
includes/UserMailer.php
+++ b/
includes/UserMailer.php
@@
-256,8
+256,13
@@
class UserMailer {
ini_set( 'html_errors', '0' );
set_error_handler( 'UserMailer::errorHandler' );
ini_set( 'html_errors', '0' );
set_error_handler( 'UserMailer::errorHandler' );
+ $safeMode = wfIniGetBool( 'safe_mode' );
foreach ( $dest as $recip ) {
foreach ( $dest as $recip ) {
- $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
+ if ( $safeMode ) {
+ $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers );
+ } else {
+ $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
+ }
}
restore_error_handler();
}
restore_error_handler();