http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73183
Revision: 73183
Author: nad
Date: 2010-09-16 23:50:09 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
use $wgEmergencyContact for fallback email address to use in From field
Modified Paths:
--------------
trunk/extensions/EmailPage/EmailPage.php
trunk/extensions/EmailPage/EmailPage_body.php
Modified: trunk/extensions/EmailPage/EmailPage.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage.php 2010-09-16 23:42:47 UTC (rev
73182)
+++ trunk/extensions/EmailPage/EmailPage.php 2010-09-16 23:50:09 UTC (rev
73183)
@@ -13,7 +13,7 @@
if ( !defined( 'MEDIAWIKI' ) ) die( 'Not an entry point.' );
-define( 'EMAILPAGE_VERSION', '1.3.4, 2009-05-04' );
+define( 'EMAILPAGE_VERSION', '1.3.5, 2010-09-17' );
$wgEmailPageGroup = 'sysop'; # Users must belong to
this group to send emails (empty string means anyone can send)
$wgEmailPageContactsCat = ''; # This specifies the name
of a category containing categories of contact pages
Modified: trunk/extensions/EmailPage/EmailPage_body.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage_body.php 2010-09-16 23:42:47 UTC
(rev 73182)
+++ trunk/extensions/EmailPage/EmailPage_body.php 2010-09-16 23:50:09 UTC
(rev 73183)
@@ -162,7 +162,7 @@
* Send the message to the recipients (or just list them if arg = false)
*/
function send( $send = true ) {
- global $wgOut, $wgUser, $wgParser, $wgServer, $wgScript,
$wgArticlePath, $wgScriptPath,
+ global $wgOut, $wgUser, $wgParser, $wgServer, $wgScript,
$wgArticlePath, $wgScriptPath, $wgEmergencyContact,
$wgEmailPageCss, $wgEmailPageGroup,
$wgEmailPageAllowRemoteAddr, $wgEmailPageAllowAllUsers;
# Set error and bail if user not in postmaster group, and
request not from trusted address
@@ -239,7 +239,7 @@
# Set up new mailer instance if sending
if ( $send ) {
$mail = new PHPMailer();
- $mail->From = $wgUser->isValidEmailAddr(
$wgUser->getEmail() ) ? $wgUser->getEmail() : "w...@$wgserver";
+ $mail->From = $wgUser->isValidEmailAddr(
$wgUser->getEmail() ) ? $wgUser->getEmail() : $wgEmergencyContact;
$mail->FromName = User::whoIsReal(
$wgUser->getId() );
$mail->Subject = $this->subject;
$mail->Body = $message;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
