Merge pull request #3577 from WordImpress/issue/3542v2

fix(admin-settings): refactor setting API to have custom save logic for setting sections #3541

includes/admin/class-admin-settings.php

@@ -297,7 +297,17 @@ public static function get_option( $option_name = '', $field_id = '', $default =
 				$option_value = get_option( $option_name, $default );
 			}
 
-			return $option_value;
+			/**
+			 * Filter the option value
+			 *
+			 * @since 2.2.3
+			 *
+			 * @param mixed  $option_value
+			 * @param string $option_name
+			 * @param string $field_id
+			 * @param mixed  $default
+			 */
+			return apply_filters( 'give_admin_field_get_value', $option_value, $option_name, $field_id, $default );
 		}
 
 		/**

includes/admin/emails/class-email-notifications.php

@@ -252,17 +252,17 @@ public function preview_email() {
 			}
 
 			// Set form id.
-			$form_id = empty( $_GET['form_id']  ) ? null : absint( $_GET['form_id'] );
+			$form_id = empty( $_GET['form_id'] ) ? null : absint( $_GET['form_id'] );
 
 			// Call setup email data to apply filter and other thing to email.
 			$email->send_preview_email( false );
 
 			// Decode message.
 			$email_message = $email->preview_email_template_tags( $email->get_email_message( $form_id ) );
 
-			// Set email template.
-			Give()->emails->html    = true;
-			Give()->emails->__set( 'template', $email->get_email_template( $form_id ) );
+			// Show formatted text in browser even text/plain content type set for an email.
+			Give()->emails->html = true;
+
 			Give()->emails->form_id = $form_id;
 
 			if ( 'text/plain' === $email->config['content_type'] ) {