10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-11 18:56:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed email notifications sendings when HTML is turned off;

Browse Source 
- fixed first install and default settings;
This commit is contained in:
nikitozzzzzzz
2017-09-21 16:31:39 +03:00
parent 7fe908a5ca
commit c1cfc8efa2
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-mail.php
+16 -8
View File
@@ -100,19 +100,27 @@ if ( ! class_exists( 'Mail' ) ) {
* @return mixed|string
*/
function prepare_template( $slug, $args = array() ) {
ob_start(); ?>
ob_start();
<html>
<?php do_action( 'um_before_email_template_body', $slug, $args ); ?>
if ( um_get_option( 'email_html' ) ) { ?>
<body <?php echo apply_filters( 'um_email_template_body_attrs', 'style="background: #f2f2f2;-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;"', $slug ) ?>>
<html>
<?php do_action( 'um_before_email_template_body', $slug, $args ); ?>
<?php echo $this->get_email_template( $slug, $args ); ?>
<body <?php echo apply_filters( 'um_email_template_body_attrs', 'style="background: #f2f2f2;-webkit-font-smoothing: antialiased;-moz-osx-font-smoothing: grayscale;"', $slug ) ?>>
</body>
</html>
<?php echo $this->get_email_template( $slug, $args ); ?>
<?php $message = ob_get_clean();
</body>
</html>
<?php } else {
echo $this->get_email_template( $slug, $args );
}
$message = ob_get_clean();
// Convert tags in email template
return um_convert_tags( $message, $args );
includes/core/class-setup.php
+14 -5
View File
@@ -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 );
}