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

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into dev/forms_optimizing

Browse Source 
Conflicts:
	includes/admin/core/class-admin-settings.php
This commit is contained in:
nikitozzzzzzz
2017-12-12 21:24:00 +02:00
parent 96c1aaf05a da7d53d0fb
commit a6ddfde2d5
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-settings.php
+7 -4
View File
@@ -1482,11 +1482,11 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
<tbody>
<?php foreach ( $section_fields as $field_data ) {
$option_value = UM()->options()->get( $field_data['id'] );
$value = ! empty( $option_value ) ? $option_value : ( ! empty( $field_data['default'] ) ? $field_data['default'] : '' );
$value = isset( $option_value ) && ! empty( $option_value ) ? $option_value : ( isset( $field_data['default'] ) ? $field_data['default'] : '' );
$license = get_option( "{$field_data['id']}_edd_answer" );
if ( is_object( $license ) ) {
if ( is_object( $license ) && ! empty( $value ) ) {
// activate_license 'invalid' on anything other than valid, so if there was an error capture it
if ( false === $license->success ) {
@@ -1718,7 +1718,10 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
);
$license_status = null;
} ?>
}
?>
<tr class="um-settings-line">
<th><label for="um_options_<?php echo $field_data['id'] ?>"><?php echo $field_data['label'] ?></label></th>
@@ -1731,7 +1734,7 @@ if ( ! class_exists( 'Admin_Settings' ) ) {
<div class="description"><?php echo $field_data['description'] ?></div>
<?php } ?>
<?php if ( ( is_object( $license ) && 'valid' == $license->license ) || 'valid' == $license ) { ?>
<?php if ( ! empty( $value ) && ( ( is_object( $license ) && 'valid' == $license->license ) || 'valid' == $license ) ) { ?>
<input type="button" class="button um_license_deactivate" id="<?php echo $field_data['id'] ?>_deactivate" value="<?php _e( 'Clear License', 'ultimate-member' ) ?>"/>
<?php } elseif ( empty( $value ) ) { ?>
<input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Activate', 'ultimate-member' ) ?>" />
includes/core/class-query.php
+1 -1
View File
@@ -109,7 +109,7 @@ if ( ! class_exists( 'Query' ) ) {
} else {
$custom_posts = new \WP_Query();
$args['post_status'] = explode( ',', $args['post_status'] );
$args['post_status'] = is_array( $args['post_status'] ) ? $args['post_status'] : explode( ',', $args['post_status'] );
$custom_posts->query( $args );
includes/core/um-filters-language.php
+1 -1
View File
@@ -48,7 +48,7 @@ function um_core_page_wpml_permalink( $array ){
$permalink_base = UM()->options()->get( 'permalink_base' );
// Get user slug
$profile_slug = get_user_meta( um_profile_id(), "um_user_profile_url_slug_{$permalink_base}", true );
$profile_slug = strtolower( get_user_meta( um_profile_id(), "um_user_profile_url_slug_{$permalink_base}", true ) );
$current_language = ICL_LANGUAGE_CODE;
foreach ( $array as $lang_code => $arr ) {
$sitepress->switch_lang( $lang_code );