diff --git a/admin/core/um-admin-access.php b/admin/core/um-admin-access.php index a03e7c3a..a93ee4ce 100644 --- a/admin/core/um-admin-access.php +++ b/admin/core/um-admin-access.php @@ -34,8 +34,13 @@ class UM_Admin_Access { *** @Checks core post type ***/ function core_post_type( $post_type ){ - if ( strstr($post_type, 'um_')) + + if ( strstr($post_type, 'um_') ) return true; + + if ( !class_exists('UM_bbPress_API') && in_array($post_type,array('forum','topic','reply')) ) + return true; + return false; } diff --git a/admin/core/um-admin-metabox.php b/admin/core/um-admin-metabox.php index 4ea75f32..52993121 100644 --- a/admin/core/um-admin-metabox.php +++ b/admin/core/um-admin-metabox.php @@ -820,7 +820,7 @@ class UM_Admin_Metabox { case '_force_good_pass': ?> -

+

edit_mode_value ) ) $this->ui_on_off('_force_good_pass', $this->edit_mode_value ); else $this->ui_on_off('_force_good_pass', 0 ); ?>

diff --git a/core/lib/mobiledetect/Mobile_Detect.php b/core/lib/mobiledetect/Mobile_Detect.php index 3a82c296..2be18a7f 100644 --- a/core/lib/mobiledetect/Mobile_Detect.php +++ b/core/lib/mobiledetect/Mobile_Detect.php @@ -1,29 +1,6 @@ - * Nick Ilyin - * - * Original author: Victor Stanciu - * - * @license Code and contributions have 'MIT License' - * More details: https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt - * - * @link Homepage: http://mobiledetect.net - * GitHub Repo: https://github.com/serbanghita/Mobile-Detect - * Google Code: http://code.google.com/p/php-mobile-detect/ - * README: https://github.com/serbanghita/Mobile-Detect/blob/master/README.md - * HOWTO: https://github.com/serbanghita/Mobile-Detect/wiki/Code-examples - * - * @version 2.8.11 - */ + +if ( !class_exists('Mobile_Detect') ) { class Mobile_Detect { @@ -1339,3 +1316,5 @@ class Mobile_Detect return self::MOBILE_GRADE_C; } } + +} \ No newline at end of file diff --git a/core/um-actions-access.php b/core/um-actions-access.php index 04d16bb1..1f688338 100644 --- a/core/um-actions-access.php +++ b/core/um-actions-access.php @@ -61,19 +61,34 @@ $post_id = get_option('woocommerce_shop_page_id'); + } else if ( is_archive() ) { + + return; + } else { if ( !get_post_type() || !isset($post->ID) ) return; } - + if ( !isset( $post_id ) ) $post_id = $post->ID; $args = $ultimatemember->access->get_meta( $post_id ); extract($args); - if ( !isset( $args['custom_access_settings'] ) || $args['custom_access_settings'] == 0 ) return; + if ( !isset( $args['custom_access_settings'] ) || $args['custom_access_settings'] == 0 ) { + + $post_id = apply_filters('um_access_control_for_parent_posts', $post_id ); + + $args = $ultimatemember->access->get_meta( $post_id ); + extract($args); + + if ( !isset( $args['custom_access_settings'] ) || $args['custom_access_settings'] == 0 ) { + return; + } + + } $redirect_to = null; diff --git a/core/um-actions-account.php b/core/um-actions-account.php index 4805f94a..074426dc 100644 --- a/core/um-actions-account.php +++ b/core/um-actions-account.php @@ -87,7 +87,7 @@ } if ( !$ultimatemember->validation->strong_pass( $_POST['user_password'] ) ) { - $ultimatemember->form->add_error('user_password', 'Your password must contain at least one capital letter and one number'); + $ultimatemember->form->add_error('user_password', __('Your password must contain at least one lowercase letter, one capital letter and one number','ultimatemember') ); $ultimatemember->account->current_tab = 'password'; } @@ -228,7 +228,7 @@