← All changes | includes/class-emails.php +7 -6 trunk → 1.2.11 View file →

		@@ -282,8 +282,9 @@
282	282	*/
283	283	public static function replace_variables( $content, $email_name = '', $email_vars = array() ) {
284	284	$site_url = home_url();
285	285	$blogname = uwp_get_blogname();
	286	+ $email_from_name = self::get_mail_from_name();
286	287	$login_url = wp_login_url( false ); // 'false' to prevent adding redirect_to to login url.
287	288	$timestamp = current_time( 'timestamp' );
288	289	$date = date_i18n( get_option( 'date_format' ), $timestamp );
289	290	$time = date_i18n( get_option( 'time_format' ), $timestamp );
		@@ -293,9 +294,9 @@
293	294	'[#blogname#]' => $blogname,
294	295	'[#site_url#]' => esc_url( $site_url ),
295	296	'[#site_name_url#]' => '<a href="' . esc_url( $site_url ) . '">' . $site_url . '</a>',
296	297	'[#site_link#]' => '<a href="' . esc_url( $site_url ) . '">' . $blogname . '</a>',
297		- '[#site_name#]' => esc_attr( $blogname ),
	298	+ '[#site_name#]' => esc_attr( $email_from_name ),
298	299	'[#login_url#]' => esc_url( $login_url ),
299	300	'[#login_link#]' => '<a href="' . esc_url( $login_url ) . '">' . __( 'Login', 'userswp' ) . '</a>',
300	301	'[#current_date#]' => date_i18n( 'Y-m-d H:i:s', $timestamp ),
301	302	'[#date#]' => $date,
		@@ -566,9 +567,9 @@
566	567	do_action( 'wpml_switch_language_for_email', $to );
567	568
568	569	$subject = self::get_subject( $email_name, $email_vars, $is_admin );
569	570	$message_body = self::get_content( $email_name, $email_vars, $is_admin );
570		- $headers = self::get_headers( $email_name, $email_vars );
	571	+ $headers = self::get_headers( $email_name, $email_vars, $is_admin );
571	572	$attachments = self::get_attachments( $email_name, $email_vars, $is_admin );
572	573
573	574	$plain_text = self::get_email_type() != 'html' ? true : false;
574	575	$template = $plain_text ? 'emails/plain/uwp-email-' . $email_name . '.php' : 'emails/uwp-email-' . $email_name . '.php';
		@@ -615,11 +616,11 @@
615	616
616	617	// Switch language to user language.
617	618	do_action( 'wpml_switch_language_for_email', $to );
618	619
619		- $subject = self::get_subject( $email_name, $email_vars, $is_admin );
	620	+ $subject = self::get_subject( $email_name, $email_vars, $is_admin );
620	621	$subject = !empty($subject) ? $subject : UsersWP_Defaults::wp_new_user_notification_email_subject();
621		- $headers = self::get_headers( $email_name, $email_vars );
	622	+ $headers = self::get_headers( $email_name, $email_vars, $is_admin );
622	623	$message = self::get_content( $email_name, $email_vars, $is_admin );
623	624	$message = !empty($message) ? $message : UsersWP_Defaults::wp_new_user_notification_email_content();
624	625
625	626	$reset_page = uwp_get_page_id( 'reset_page', false );
		@@ -681,11 +682,11 @@
681	682
682	683	// Switch language to user language.
683	684	do_action( 'wpml_switch_language_for_email', $to );
684	685
685		- $subject = self::get_subject( $email_name, $email_vars, $is_admin );
	686	+ $subject = self::get_subject( $email_name, $email_vars, $is_admin );
686	687	$subject = !empty($subject) ? $subject : UsersWP_Defaults::wp_new_user_notification_email_subject_admin();
687		- $headers = self::get_headers( $email_name, $email_vars );
	688	+ $headers = self::get_headers( $email_name, $email_vars, $is_admin );
688	689	$message = self::get_content( $email_name, $email_vars, $is_admin );
689	690	$message = !empty($message) ? $message : UsersWP_Defaults::wp_new_user_notification_email_content_admin();
690	691
691	692	$plain_text = self::get_email_type() != 'html' ? true : false;