diff --git a/README.md b/README.md index c65e6b13..21b252e4 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Ultimate Member is the #1 user profile & membership plugin for WordPress. The pl | Latest Version |Requires at least|Stable Tag| | :------------: |:------------:|:------------:| -| 2.0.30 | WordPress 4.9 or higher| 2.0.30 | +| 2.0.31 | WordPress 4.9 or higher| 2.0.31 | Features of the plugin include: @@ -48,7 +48,7 @@ GNU Version 2 or Any Later Version Releases ==================== -[Official Release Version: 2.0.30](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.30). +[Official Release Version: 2.0.31](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.31). Changelog ==================== diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php index 1ef61d0b..f1a778f7 100644 --- a/includes/core/class-enqueue.php +++ b/includes/core/class-enqueue.php @@ -88,17 +88,15 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_script( 'um_fileupload', $this->js_baseurl . 'um-fileupload' . $this->suffix . '.js', array( 'jquery', 'um_jquery_form' ), ultimatemember_version, true ); - $datetime_deps = array( 'jquery' ); - // load a localized version for date/time - $locale = get_locale(); - if ( $locale && file_exists( um_path . 'assets/js/pickadate/translations/' . $locale . '.js' ) ) { - wp_register_script('um_datetime_locale', um_url . 'assets/js/pickadate/translations/' . $locale . '.js', array( 'jquery' ), ultimatemember_version, true ); - $datetime_deps[] = 'um_datetime_locale'; - } - wp_register_script( 'um_datetime', $this->js_baseurl . 'pickadate/picker.js', $datetime_deps, ultimatemember_version, true ); + wp_register_script( 'um_datetime', $this->js_baseurl . 'pickadate/picker.js', array( 'jquery' ), ultimatemember_version, true ); wp_register_script( 'um_datetime_date', $this->js_baseurl . 'pickadate/picker.date.js', array( 'jquery', 'um_datetime' ), ultimatemember_version, true ); wp_register_script( 'um_datetime_time', $this->js_baseurl . 'pickadate/picker.time.js', array( 'jquery', 'um_datetime' ), ultimatemember_version, true ); wp_register_script( 'um_datetime_legacy', $this->js_baseurl . 'pickadate/legacy.js', array( 'jquery', 'um_datetime' ), ultimatemember_version, true ); + // load a localized version for date/time + $locale = get_locale(); + if ( $locale && file_exists( um_path . 'assets/js/pickadate/translations/' . $locale . '.js' ) ) { + wp_register_script('um_datetime_locale', um_url . 'assets/js/pickadate/translations/' . $locale . '.js', array( 'jquery', 'um_datetime' ), ultimatemember_version, true ); + } wp_register_script( 'um_tipsy', $this->js_baseurl . 'um-tipsy' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); wp_register_script( 'um_raty', $this->js_baseurl . 'um-raty' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); @@ -110,7 +108,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_script('um_functions', $this->js_baseurl . 'um-functions' . $this->suffix . '.js', array( 'jquery', 'jquery-masonry', 'wp-util', 'um_scrollbar' ), ultimatemember_version, true ); wp_register_script( 'um-gdpr', $this->js_baseurl . 'um-gdpr' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, false ); wp_register_script('um_conditional', $this->js_baseurl . 'um-conditional' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); - wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional' ), ultimatemember_version, true ); + wp_register_script('um_scripts', $this->js_baseurl . 'um-scripts' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'um_conditional', 'um_datetime', 'um_datetime_date', 'um_datetime_time', 'um_datetime_legacy' ), ultimatemember_version, true ); /** * UM hook * @@ -327,6 +325,13 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_enqueue_script('um_datetime_date'); wp_enqueue_script('um_datetime_time'); wp_enqueue_script('um_datetime_legacy'); + + // load a localized version for date/time + $locale = get_locale(); + if ( $locale && file_exists( um_path . 'assets/js/pickadate/translations/' . $locale . '.js' ) ) { + wp_enqueue_script('um_datetime_locale' ); + } + wp_enqueue_style('um_datetime'); wp_enqueue_style('um_datetime_date'); wp_enqueue_style('um_datetime_time'); diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po index fa97e398..56e21e0c 100644 --- a/languages/ultimate-member-en_US.po +++ b/languages/ultimate-member-en_US.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Ultimate Member\n" -"POT-Creation-Date: 2018-11-12 17:51+0200\n" -"PO-Revision-Date: 2018-11-12 17:52+0200\n" +"POT-Creation-Date: 2018-11-14 11:06+0200\n" +"PO-Revision-Date: 2018-11-14 11:06+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en_US\n" @@ -3536,8 +3536,8 @@ msgstr "" #: includes/core/um-actions-profile.php:554 #: includes/core/um-actions-profile.php:693 #: includes/core/um-actions-profile.php:726 -#: includes/core/um-actions-profile.php:1073 -#: includes/core/um-actions-profile.php:1080 +#: includes/core/um-actions-profile.php:1071 +#: includes/core/um-actions-profile.php:1078 msgid "Cancel" msgstr "" @@ -3900,7 +3900,7 @@ msgid "Members" msgstr "" #: includes/class-config.php:133 includes/class-config.php:738 -#: includes/core/um-actions-profile.php:1079 +#: includes/core/um-actions-profile.php:1077 #: includes/core/um-actions-user.php:15 msgid "Logout" msgstr "" @@ -6913,17 +6913,17 @@ msgstr "" msgid "Tell us a bit about yourself..." msgstr "" -#: includes/core/um-actions-profile.php:907 +#: includes/core/um-actions-profile.php:905 #, php-format msgid "This user account status is %s" msgstr "" -#: includes/core/um-actions-profile.php:1046 -#: includes/core/um-actions-profile.php:1077 +#: includes/core/um-actions-profile.php:1044 +#: includes/core/um-actions-profile.php:1075 msgid "Edit Profile" msgstr "" -#: includes/core/um-actions-profile.php:1078 +#: includes/core/um-actions-profile.php:1076 msgid "My Account" msgstr "" diff --git a/readme.txt b/readme.txt index 65bf3aa6..908b046c 100644 --- a/readme.txt +++ b/readme.txt @@ -6,7 +6,7 @@ Donate link: Tags: community, member, membership, user-profile, user-registration Requires at least: 4.7 Tested up to: 4.9 -Stable tag: 2.0.30 +Stable tag: 2.0.31 License: GNU Version 2 or Any Later Version License URI: http://www.gnu.org/licenses/gpl-3.0.txt @@ -137,6 +137,11 @@ The plugin works with popular caching plugins by automatically excluding Ultimat = Important: UM2.0+ is a significant update to the code base from 1.3.88. Please make sure you take a full-site backup with restore point before updating the plugin = += 2.0.31: November 14, 2018 = + +* Bugfixes: + - Fixed compatibility with JS/CSS cache plugins + = 2.0.30: November 12, 2018 = * Bugfixes: diff --git a/ultimate-member.php b/ultimate-member.php index 6fb8cc17..bfcda217 100644 --- a/ultimate-member.php +++ b/ultimate-member.php @@ -3,7 +3,7 @@ Plugin Name: Ultimate Member Plugin URI: http://ultimatemember.com/ Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress -Version: 2.0.30 +Version: 2.0.31 Author: Ultimate Member Author URI: http://ultimatemember.com/ Text Domain: ultimate-member