10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

- fixed get_meta_value function for options with "0" value;

Browse Source 
- fixed upgrade to 2.0 for transferring menu restriction;
This commit is contained in:
nikitozzzzzzz
2017-08-30 16:01:43 +03:00
parent e848301fa9
commit 1f5bf3dafc
5 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/packages/2.0.php
+29 -1
View File
@@ -1166,4 +1166,32 @@ foreach ( $emails as $email_key => $value ) {
}
}
}
}
}
/**
* Transferring menu restriction data
*/
$menus = get_posts( array(
'post_type' => 'nav_menu_item',
'meta_query' => array(
array(
'key' => 'menu-item-um_nav_roles',
'compare' => 'EXISTS',
)
)
) );
foreach ( $menus as $menu ) {
$menu_roles = get_post_meta( $menu->ID, 'menu-item-um_nav_roles', true );
$menu_roles = array_map( function( $item ) {
if ( strpos( $item, 'um_' ) === 0 )
return $item;
return 'um_' . $item;
}, $menu_roles );
update_post_meta( $menu->ID, 'menu-item-um_nav_roles', $menu_roles );
}
includes/admin/templates/form/login_customize.php
+7 -3
View File
@@ -53,10 +53,14 @@
),
array(
'id' => '_um_login_secondary_btn',
'type' => 'checkbox',
'type' => 'select',
'label' => __( 'Show Secondary Button', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_secondary_btn', null, 1 ),
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
'value' => UM()->query()->get_meta_value( '_um_login_secondary_btn', null, um_get_option( 'login_secondary_btn' ) ),
'conditional' => array( '_um_login_use_custom_settings', '=', 1 ),
'options' => array(
0 => __( 'No', 'ultimate-member' ),
1 => __( 'Yes', 'ultimate-member' ),
),
),
array(
'id' => '_um_login_secondary_btn_word',
includes/admin/templates/form/profile_customize.php
+8 -4
View File
@@ -77,12 +77,16 @@
),
array(
'id' => '_um_profile_secondary_btn',
'type' => 'checkbox',
'type' => 'select',
'label' => __( 'Show Secondary Button', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_secondary_btn', null, 1 ),
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
'value' => UM()->query()->get_meta_value( '_um_profile_secondary_btn', null, um_get_option( 'profile_secondary_btn' ) ),
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 ),
'options' => array(
0 => __( 'No', 'ultimate-member' ),
1 => __( 'Yes', 'ultimate-member' ),
),
),
array(
array(
'id' => '_um_profile_secondary_btn_word',
'type' => 'text',
'label' => __( 'Primary Button Text', 'ultimate-member' ),
includes/admin/templates/form/register_customize.php
+7 -3
View File
@@ -68,10 +68,14 @@
),
array(
'id' => '_um_register_secondary_btn',
'type' => 'checkbox',
'type' => 'select',
'label' => __( 'Show Secondary Button', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_register_secondary_btn', null, 1 ),
'conditional' => array( '_um_register_use_custom_settings', '=', 1 )
'value' => UM()->query()->get_meta_value( '_um_register_secondary_btn', null, um_get_option( 'register_secondary_btn' ) ),
'conditional' => array( '_um_register_use_custom_settings', '=', 1 ),
'options' => array(
0 => __( 'No', 'ultimate-member' ),
1 => __( 'Yes', 'ultimate-member' ),
),
),
array(
'id' => '_um_register_secondary_btn_word',
includes/core/class-query.php
+12 -6
View File
@@ -258,15 +258,21 @@ if ( ! class_exists( 'Query' ) ) {
return $array;
}
/***
*** @Capture selected value
***/
/**
* Capture selected value
*
* @param $key
* @param null $array_key
* @param null $fallback
* @return int|mixed|null|string
*/
function get_meta_value( $key, $array_key = null, $fallback = null ) {
global $post;
$post_id = get_the_ID();
$try = get_post_meta( $post_id, $key, true );
if ( ! empty( $try ) )
//old version if ( ! empty( $try ) )
if ( false !== $try )
if ( is_array( $try ) && in_array( $array_key, $try ) ) {
return $array_key;
} else if ( is_array( $try ) ) {
@@ -275,13 +281,13 @@ if ( ! class_exists( 'Query' ) ) {
return $try;
}
if ($fallback == 'na') {
if ( $fallback == 'na' ) {
$fallback = 0;
$none = '';
} else {
$none = 0;
}
return (!empty($fallback)) ? $fallback : $none;
return ! empty( $fallback ) ? $fallback : $none;
}
/***