| Index: trunk/extensions/EmailPage/EmailPage_body.php |
| — | — | @@ -162,7 +162,7 @@ |
| 163 | 163 | * Send the message to the recipients (or just list them if arg = false) |
| 164 | 164 | */ |
| 165 | 165 | function send( $send = true ) { |
| 166 | | - global $wgOut, $wgUser, $wgParser, $wgServer, $wgScript, $wgArticlePath, $wgScriptPath, |
| | 166 | + global $wgOut, $wgUser, $wgParser, $wgServer, $wgScript, $wgArticlePath, $wgScriptPath, $wgEmergencyContact, |
| 167 | 167 | $wgEmailPageCss, $wgEmailPageGroup, $wgEmailPageAllowRemoteAddr, $wgEmailPageAllowAllUsers; |
| 168 | 168 | |
| 169 | 169 | # Set error and bail if user not in postmaster group, and request not from trusted address |
| — | — | @@ -239,7 +239,7 @@ |
| 240 | 240 | # Set up new mailer instance if sending |
| 241 | 241 | if ( $send ) { |
| 242 | 242 | $mail = new PHPMailer(); |
| 243 | | - $mail->From = $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ? $wgUser->getEmail() : "wiki@$wgServer"; |
| | 243 | + $mail->From = $wgUser->isValidEmailAddr( $wgUser->getEmail() ) ? $wgUser->getEmail() : $wgEmergencyContact; |
| 244 | 244 | $mail->FromName = User::whoIsReal( $wgUser->getId() ); |
| 245 | 245 | $mail->Subject = $this->subject; |
| 246 | 246 | $mail->Body = $message; |
| Index: trunk/extensions/EmailPage/EmailPage.php |
| — | — | @@ -13,7 +13,7 @@ |
| 14 | 14 | |
| 15 | 15 | if ( !defined( 'MEDIAWIKI' ) ) die( 'Not an entry point.' ); |
| 16 | 16 | |
| 17 | | -define( 'EMAILPAGE_VERSION', '1.3.4, 2009-05-04' ); |
| | 17 | +define( 'EMAILPAGE_VERSION', '1.3.5, 2010-09-17' ); |
| 18 | 18 | |
| 19 | 19 | $wgEmailPageGroup = 'sysop'; # Users must belong to this group to send emails (empty string means anyone can send) |
| 20 | 20 | $wgEmailPageContactsCat = ''; # This specifies the name of a category containing categories of contact pages |