diff --git a/assets/css/um-fonticons-fa.css b/assets/css/um-fonticons-fa.css index 5577f1a5..4dc178d0 100644 --- a/assets/css/um-fonticons-fa.css +++ b/assets/css/um-fonticons-fa.css @@ -24,6 +24,9 @@ -moz-osx-font-smoothing: grayscale; } +.um-faicon-sticky-note:before { + content: "\f249"; +} .um-faicon-glass:before { content: "\f000"; } diff --git a/includes/class-init.php b/includes/class-init.php index 28928042..e27b90ca 100644 --- a/includes/class-init.php +++ b/includes/class-init.php @@ -34,7 +34,8 @@ if ( ! class_exists( 'UM' ) ) { * @method UM_Groups Groups() * @method UM_Frontend_Posting Frontend_Posting() * @method UM_Notes Notes() - * + * @method UM_User_Bookmarks User_Bookmarks() + * @method UM_Unsplash Unsplash() */ final class UM extends UM_Functions { @@ -439,14 +440,18 @@ if ( ! class_exists( 'UM' ) ) { */ function activation() { if ( is_multisite() ) { - //get all blogs - $blogs = get_sites(); - if ( ! empty( $blogs ) ) { - foreach( $blogs as $blog ) { - switch_to_blog( $blog->blog_id ); - //make activation script for each sites blog - $this->single_site_activation(); - restore_current_blog(); + if ( ! is_plugin_active_for_network( um_plugin ) ) { + $this->single_site_activation(); + } else { + //get all blogs + $blogs = get_sites(); + if ( ! empty( $blogs ) ) { + foreach( $blogs as $blog ) { + switch_to_blog( $blog->blog_id ); + //make activation script for each sites blog + $this->single_site_activation(); + restore_current_blog(); + } } } } else { diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po index 26844f4d..abce8e78 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: 2019-05-07 11:26+0300\n" -"PO-Revision-Date: 2019-05-07 11:26+0300\n" +"POT-Creation-Date: 2019-05-08 11:05+0300\n" +"PO-Revision-Date: 2019-05-08 11:05+0300\n" "Last-Translator: \n" "Language-Team: \n" "Language: en_US\n" @@ -4146,7 +4146,7 @@ msgstr "" msgid "%s License Key" msgstr "" -#: includes/class-init.php:153 includes/class-init.php:162 +#: includes/class-init.php:155 includes/class-init.php:164 msgid "Cheatin’ huh?" msgstr "" @@ -4250,7 +4250,7 @@ msgstr "" msgid "You must add a shortcode to the content area" msgstr "" -#: includes/core/class-builtin.php:663 includes/core/class-user.php:1545 +#: includes/core/class-builtin.php:663 includes/core/class-user.php:1544 msgid "Only me" msgstr "" @@ -6441,7 +6441,7 @@ msgstr "" msgid "You can not edit this user" msgstr "" -#: includes/core/class-mail.php:609 includes/core/class-password.php:701 +#: includes/core/class-mail.php:612 includes/core/class-password.php:701 #: includes/core/class-profile.php:424 msgid "Your set password" msgstr "" diff --git a/readme.txt b/readme.txt index fbb7870b..311994c4 100644 --- a/readme.txt +++ b/readme.txt @@ -4,8 +4,8 @@ Plugin URI: https://ultimatemember.com/ Contributors: ultimatemember, champsupertramp, nsinelnikov Donate link: Tags: community, member, membership, user-profile, user-registration -Requires at least: 4.7 -Tested up to: 5.1 +Requires at least: 4.9 +Tested up to: 5.2 Stable tag: 2.0.44 License: GNU Version 2 or Any Later Version License URI: http://www.gnu.org/licenses/gpl-3.0.txt @@ -133,7 +133,7 @@ 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.44: May 07, 2019 = += 2.0.44: May 08, 2019 = * Enhancements: - Added automatically template saver when you upgrade your theme @@ -155,6 +155,7 @@ The plugin works with popular caching plugins by automatically excluding Ultimat - Replace placeholders duplicates - Password Reset link regeneration - Fixed issues with scroll on mobile devices + - Fixed multisite activation * Deprecated: - "Is Account page?" and "Is User page?" options for WPML integration ( because WPML translations works properly )