diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php index 94835370..25342733 100644 --- a/includes/core/class-mail.php +++ b/includes/core/class-mail.php @@ -100,19 +100,27 @@ if ( ! class_exists( 'Mail' ) ) { * @return mixed|string */ function prepare_template( $slug, $args = array() ) { - ob_start(); ?> + ob_start(); - - + if ( um_get_option( 'email_html' ) ) { ?> - > + + - get_email_template( $slug, $args ); ?> + > - - + get_email_template( $slug, $args ); ?> - + + + get_email_template( $slug, $args ); + + } + + $message = ob_get_clean(); // Convert tags in email template return um_convert_tags( $message, $args ); diff --git a/includes/core/class-setup.php b/includes/core/class-setup.php index 8d610acb..a8523b42 100644 --- a/includes/core/class-setup.php +++ b/includes/core/class-setup.php @@ -39,13 +39,17 @@ if ( ! class_exists( 'Setup' ) ) { ***/ function install_default_forms() { + $options = get_option( 'um_options' ); + $options = empty( $options ) ? array() : $options; + if ( current_user_can( 'manage_options' ) && ! get_option( 'um_is_installed' ) ) { update_option( 'um_is_installed', 1 ); //Install default options foreach ( UM()->config()->settings_defaults as $key => $value ) { - UM()->um_update_option( $key, $value ); + $options[$key] = $value; + //UM()->um_update_option( $key, $value ); } // Install Core Forms @@ -93,7 +97,8 @@ if ( ! class_exists( 'Setup' ) ) { } - if ( isset( $core_forms ) ) update_option( 'um_core_forms', $core_forms ); + if ( isset( $core_forms ) ) + update_option( 'um_core_forms', $core_forms ); // Install Core Directories foreach ( UM()->config()->core_directories as $id ) { @@ -184,10 +189,13 @@ if ( ! class_exists( 'Setup' ) ) { } foreach ( $core_pages as $slug => $page_id ) { - UM()->um_update_option( apply_filters( 'um_core_page_id_filter', 'core_' . $slug ), $page_id ); + $key = apply_filters( 'um_core_page_id_filter', 'core_' . $slug ); + $options[$key] = $page_id; + //UM()->um_update_option( apply_filters( 'um_core_page_id_filter', 'core_' . $slug ), $page_id ); } } + update_option( 'um_options', $options ); } @@ -201,9 +209,10 @@ if ( ! class_exists( 'Setup' ) ) { foreach ( UM()->config()->settings_defaults as $key => $value ) { //set new options to default if ( ! isset( $options[$key] ) ) - UM()->um_update_option( $key, $value ); - + $options[$key] = $value; } + + update_option( 'um_options', $options ); }