| @@ -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, |