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

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into beta/2.1.0

Browse Source
This commit is contained in:
nikitasinelnikov
2019-08-14 11:43:33 +03:00
parent 4a5863db51 d546da3010
commit b5a374b5a6
12 changed files with 125 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-builder.php
+1 -1
View File
@@ -150,7 +150,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
}
// set unique meta key
if ( in_array( $field_type, $fields_without_metakey ) && ! isset( $array['post']['_metakey'] ) ) {
if ( in_array( $field_type, $fields_without_metakey ) || ! isset( $array['post']['_metakey'] ) ) {
$array['post']['_metakey'] = "um_{$field_type}_{$form_id}_{$count}";
}
includes/admin/core/class-admin-settings.php
+1 -1
View File
@@ -727,7 +727,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
array(
'id' => 'profile_icons',
'type' => 'select',
'label' => __( 'Profile Field Icons' ),
'label' => __( 'Profile Field Icons','ultimate-member' ),
'tooltip' => __( 'This is applicable for edit mode only','ultimate-member' ),
'default' => um_get_metadefault('profile_icons'),
'options' => array(