| @@ -240,9 +240,9 @@ | ||
| 240 | 240 | * @return void |
| 241 | 241 | */ |
| 242 | 242 | private function set_from( $user_id_args ) { |
| 243 | 243 | if ( empty( $this->settings['from'] ) ) { |
| 244 | - $from = FrmEmailHelper::get_default_from_email(); | |
| 244 | + $from = get_option( 'admin_email' ); | |
| 245 | 245 | } else { |
| 246 | 246 | $from = $this->prepare_email_setting( $this->settings['from'], $user_id_args ); |
| 247 | 247 | } |
| 248 | 248 | |
| @@ -280,15 +280,11 @@ | ||
| 280 | 280 | * |
| 281 | 281 | * @return void |
| 282 | 282 | */ |
| 283 | 283 | private function set_is_plain_text() { |
| 284 | - if ( empty( $this->settings['email_style'] ) ) { | |
| 285 | - // If `email_style` isn't set, use the `plain_text` checkbox. | |
| 286 | - $this->is_plain_text = ! empty( $this->settings['plain_text'] ); | |
| 287 | - return; | |
| 284 | + if ( $this->settings['plain_text'] ) { | |
| 285 | + $this->is_plain_text = true; | |
| 288 | 286 | } |
| 289 | - | |
| 290 | - $this->is_plain_text = 'plain' === $this->settings['email_style']; | |
| 291 | 287 | } |
| 292 | 288 | |
| 293 | 289 | /** |
| 294 | 290 | * Set the include_user_info property |
| @@ -401,13 +397,12 @@ | ||
| 401 | 397 | $pass_entry = clone $this->entry; |
| 402 | 398 | $mail_body = FrmEntriesHelper::replace_default_message( |
| 403 | 399 | $prev_mail_body, |
| 404 | 400 | array( |
| 405 | - 'id' => $this->entry->id, | |
| 406 | - 'entry' => $pass_entry, | |
| 407 | - 'plain_text' => $this->is_plain_text, | |
| 408 | - 'user_info' => $this->include_user_info, | |
| 409 | - 'table_style' => $this->settings['email_style'], | |
| 401 | + 'id' => $this->entry->id, | |
| 402 | + 'entry' => $pass_entry, | |
| 403 | + 'plain_text' => $this->is_plain_text, | |
| 404 | + 'user_info' => $this->include_user_info, | |
| 410 | 405 | ) |
| 411 | 406 | ); |
| 412 | 407 | |
| 413 | 408 | // Add the user info if it isn't already included |
| @@ -420,8 +415,10 @@ | ||
| 420 | 415 | } |
| 421 | 416 | |
| 422 | 417 | $this->message = $mail_body; |
| 423 | 418 | |
| 419 | + $this->message = do_shortcode( $this->message ); | |
| 420 | + | |
| 424 | 421 | if ( $this->is_plain_text ) { |
| 425 | 422 | $this->message = wp_specialchars_decode( strip_tags( $this->message ), ENT_QUOTES ); |
| 426 | 423 | $this->message = str_replace( ' ', '', $this->message ); |
| 427 | 424 | } else { |
| @@ -883,9 +880,8 @@ | ||
| 883 | 880 | 'attachments' => $this->attachments, |
| 884 | 881 | 'plain_text' => $this->is_plain_text, |
| 885 | 882 | 'form' => $this->form, |
| 886 | 883 | 'entry' => $this->entry, |
| 887 | - 'email_style' => $this->settings['email_style'], | |
| 888 | 884 | ); |
| 889 | 885 | } |
| 890 | 886 | |
| 891 | 887 | /** |
