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

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into fix/wpml_emails_templates

Browse Source 
Conflicts:
	includes/um-deprecated-functions.php
	includes/um-short-functions.php
This commit is contained in:
nikitozzzzzzz
2017-12-19 14:47:47 +02:00
parent f861de65a8 ef9c06185b
commit b9ecb63cb3
41 changed files with 4928 additions and 4513 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-forms-settings.php
+2
View File
@@ -33,6 +33,7 @@ if ( ! class_exists( 'Admin_Forms_Settings' ) ) {
return $field_data['value' . $i];
} else {
$value = UM()->options()->get( $field_data['id' . $i] );
$value = is_string( $value ) ? stripslashes( $value ) : $value;
return '' !== $value ? $value : $default;
}
} else {
@@ -40,6 +41,7 @@ if ( ! class_exists( 'Admin_Forms_Settings' ) ) {
return $field_data['value'. $i];
} else {
$value = UM()->options()->get( $field_data['id' . $i] );
$value = is_string( $value ) ? stripslashes( $value ) : $value;
return isset( $value ) ? $value : $default;
}
}
includes/admin/core/class-admin-forms.php
+11 -2
View File
@@ -972,6 +972,11 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
}
function render_info_text( $field_data ) {
return $field_data['value'];
}
/**
* Get field value
*
@@ -984,10 +989,14 @@ if ( ! class_exists( 'Admin_Forms' ) ) {
$default = isset( $field_data['default' . $i] ) ? $field_data['default' . $i] : $default;
if ( $field_data['type'] == 'checkbox' || $field_data['type'] == 'multi_checkbox' ) {
return ( isset( $field_data['value' . $i] ) && '' !== $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
$value = ( isset( $field_data['value' . $i] ) && '' !== $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
} else {
return isset( $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
$value = isset( $field_data['value' . $i] ) ? $field_data['value' . $i] : $default;
}
$value = is_string( $value ) ? stripslashes( $value ) : $value;
return $value;
}
}
}
includes/admin/core/um-admin-actions-modal.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Put status handler in modal
includes/admin/core/um-admin-actions-user.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @Does an action to user asap
includes/admin/core/um-admin-actions.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/**
*
includes/admin/core/um-admin-filters-fields.php
+3
View File
@@ -1,4 +1,7 @@
<?php
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
/***
*** @modify field args just before it is saved into form