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

- hotfix, removed PHP notices and warnings;

Browse Source
This commit is contained in:
nikitozzzzzzz
2017-10-31 15:49:48 +02:00
parent cb504d635e
commit b2a67974bd
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/um-admin-filters-fields.php
+5
View File
@@ -7,22 +7,27 @@
function um_admin_pre_save_field_to_form( $array ){
unset( $array['conditions'] );
if ( isset($array['conditional_field']) && !empty( $array['conditional_action'] ) && !empty( $array['conditional_operator'] ) ) {
$array['conditional_value'] = ! empty( $array['conditional_value'] ) ? $array['conditional_value'] : '';
$array['conditions'][] = array( $array['conditional_action'], $array['conditional_field'], $array['conditional_operator'], $array['conditional_value'] );
}
if ( isset($array['conditional_field1']) && !empty( $array['conditional_action1'] ) && !empty( $array['conditional_operator1'] ) ) {
$array['conditional_value1'] = ! empty( $array['conditional_value1'] ) ? $array['conditional_value1'] : '';
$array['conditions'][] = array( $array['conditional_action1'], $array['conditional_field1'], $array['conditional_operator1'], $array['conditional_value1'] );
}
if ( isset($array['conditional_field2']) && !empty( $array['conditional_action2'] ) && !empty( $array['conditional_operator2'] ) ) {
$array['conditional_value2'] = ! empty( $array['conditional_value2'] ) ? $array['conditional_value2'] : '';
$array['conditions'][] = array( $array['conditional_action2'], $array['conditional_field2'], $array['conditional_operator2'], $array['conditional_value2'] );
}
if ( isset($array['conditional_field3']) && !empty( $array['conditional_action3'] ) && !empty( $array['conditional_operator3'] ) ) {
$array['conditional_value3'] = ! empty( $array['conditional_value3'] ) ? $array['conditional_value3'] : '';
$array['conditions'][] = array( $array['conditional_action3'], $array['conditional_field3'], $array['conditional_operator3'], $array['conditional_value3'] );
}
if ( isset($array['conditional_field4']) && !empty( $array['conditional_action4'] ) && !empty( $array['conditional_operator4'] ) ) {
$array['conditional_value4'] = ! empty( $array['conditional_value4'] ) ? $array['conditional_value4'] : '';
$array['conditions'][] = array( $array['conditional_action4'], $array['conditional_field4'], $array['conditional_operator4'], $array['conditional_value4'] );
}
includes/admin/templates/dashboard/cache.php
+2 -2
View File
@@ -3,9 +3,9 @@
$all_options = wp_load_alloptions();
$count = 0;
foreach( $all_options as $k => $v ) {
foreach ( $all_options as $k => $v ) {
if ( strstr( $k, 'um_cache_userdata_' ) ) {
if ( strstr( $k, 'um_cache_userdata_' ) !== false ) {
$count++;
}
includes/core/um-actions-form.php
+3
View File
@@ -150,6 +150,9 @@
foreach ( $array['conditions'] as $condition ) {
list( $visibility, $parent_key, $op, $parent_value ) = $condition;
if ( ! isset( $args[ $parent_key ] ) )
continue;
$cond_value = ( $fields[ $parent_key ]['type'] == 'radio' ) ? $args[ $parent_key ][0] : $args[ $parent_key ];
if ( $visibility == 'hide' ) {
includes/core/um-actions-profile.php
+9 -5
View File
@@ -748,14 +748,17 @@
* @param integer $user_id
* @param array $arr_files
*/
add_action( "um_before_user_upload", "um_before_user_upload", 10, 2 );
function um_before_user_upload( $user_id, $arr_files ) {
um_fetch_user( $user_id );
foreach ($arr_files as $key => $filename) {
if (um_user( $key )) {
if (basename( $filename ) != basename( um_user( $key ) ) || in_array( $old_filename, array( basename( um_user( $key ) ), basename( $filename ) ) ) || $filename == 'empty_file') {
$old_filename = um_user( $key );
foreach ( $arr_files as $key => $filename ) {
if ( um_user( $key ) ) {
$old_filename = um_user( $key );
if ( basename( $filename ) != basename( um_user( $key ) ) ||
in_array( $old_filename, array( basename( um_user( $key ) ), basename( $filename ) ) ) ||
$filename == 'empty_file' ) {
$path = UM()->files()->upload_basedir;
delete_user_meta( $user_id, $old_filename );
if (file_exists( $path . $user_id . '/' . $old_filename )) {
@@ -765,3 +768,4 @@
}
}
}
add_action( "um_before_user_upload", "um_before_user_upload", 10, 2 );