0001-Fix-12646-notification-email-not-sent-to-user-when-u.patch (2,133 bytes)
From 3c10a62edfe0e88b09847b3e827d5fae22b7b8ba Mon Sep 17 00:00:00 2001
From: Damien Regad <damien.regad@merckserono.net>
Date: Wed, 5 Jan 2011 15:17:55 +0100
Subject: [PATCH] Fix #12646: notification email not sent to user when updating profile and LDAP=on
Problem was introduced in commit 7672ca3d7f000, changing from
$f_email to $t_email: one reference to $f_email was left out in the call to
email_store.
Changed the copyright to 2011.
---
manage_user_update.php | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/manage_user_update.php b/manage_user_update.php
index f6380a1..ad70b44 100644
--- a/manage_user_update.php
+++ b/manage_user_update.php
@@ -17,7 +17,7 @@
/**
* @package MantisBT
* @copyright Copyright (C) 2000 - 2002 Kenzaburo Ito - kenito@300baud.org
- * @copyright Copyright (C) 2002 - 2010 MantisBT Team - mantisbt-dev@lists.sourceforge.net
+ * @copyright Copyright (C) 2002 - 2011 MantisBT Team - mantisbt-dev@lists.sourceforge.net
* @link http://www.mantisbt.org
*/
/**
@@ -50,7 +50,6 @@
$t_user = user_get_row( $f_user_id );
- $f_email = trim( $f_email );
$f_username = trim( $f_username );
$t_old_username = $t_user['username'];
@@ -87,7 +86,7 @@
if ( $t_ldap && config_get( 'use_ldap_email' ) ) {
$t_email = ldap_email( $f_user_id );
} else {
- $t_email = email_append_domain( $f_email );
+ $t_email = email_append_domain( trim( $f_email ) );
email_ensure_valid( $t_email );
email_ensure_not_disposable( $t_email );
}
@@ -165,7 +164,7 @@
$t_subject = '[' . config_get( 'window_title' ) . '] ' . lang_get( 'email_user_updated_subject' );
$t_updated_msg = lang_get( 'email_user_updated_msg' );
$t_message = $t_updated_msg . "\n\n" . config_get( 'path' ) . 'account_page.php' . "\n\n" . $t_changes;
- email_store( $f_email, $t_subject, $t_message );
+ email_store( $t_email, $t_subject, $t_message );
log_event( LOG_EMAIL, sprintf( 'Account update notification sent to ' . $f_username . ' (' . $t_email . ')' ) );
if ( config_get( 'email_send_using_cronjob' ) == OFF ) {
email_send_all();
--
1.7.1
