diff --git a/README.md b/README.md
index 1a4aff83..abebb2bd 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.41 | WordPress 4.9 or higher| 2.0.41 |
+| 2.0.42 | WordPress 4.9 or higher| 2.0.42 |
Features of the plugin include:
@@ -48,7 +48,7 @@ GNU Version 2 or Any Later Version
Releases
====================
-[Official Release Version: 2.0.41](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.41).
+[Official Release Version: 2.0.42](https://github.com/ultimatemember/ultimatemember/releases/tag/2.0.42).
Changelog
====================
diff --git a/includes/admin/core/class-admin-enqueue.php b/includes/admin/core/class-admin-enqueue.php
index 7a11f88a..786b9920 100644
--- a/includes/admin/core/class-admin-enqueue.php
+++ b/includes/admin/core/class-admin-enqueue.php
@@ -429,7 +429,6 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
* Load Gutenberg blocks js
*/
function load_gutenberg_shortcode_blocks() {
-
if ( ! function_exists( 'register_block_type' ) ) {
// Gutenberg is not active.
return;
@@ -441,6 +440,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
return;
}
+ $enable_blocks = UM()->options()->get( 'enable_blocks' );
+ if ( empty( $enable_blocks ) ) {
+ return;
+ }
+
wp_register_script( 'um-blocks-shortcode-js', $this->js_url . 'um-admin-blocks-shortcode.js', array( 'wp-i18n', 'wp-blocks', 'wp-components' ), ultimatemember_version, true );
wp_set_script_translations( 'um-blocks-shortcode-js', 'ultimate-member' );
wp_enqueue_script( 'um-blocks-shortcode-js' );
@@ -499,7 +503,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
* @return array
*/
function blocks_category( $categories, $post ) {
- return array_merge(
+ $enable_blocks = UM()->options()->get( 'enable_blocks' );
+ if ( empty( $enable_blocks ) ) {
+ return $categories;
+ }
+
+ return array_merge(
$categories,
array(
array(
diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index 4654db7d..1697a4e8 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -1067,6 +1067,12 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
'label' => __( 'Disable Cache User Profile', 'ultimate-member' ),
'tooltip' => __( 'Check this box if you would like to disable Ultimate Member user\'s cache.', 'ultimate-member' ),
),
+ array(
+ 'id' => 'enable_blocks',
+ 'type' => 'checkbox',
+ 'label' => __( 'Enable Gutenberg Blocks', 'ultimate-member' ),
+ 'tooltip' => __( 'Check this box if you would like to use Ultimate Member blocks in Gutenberg editor. Important some themes have the conflicts with Gutenberg editor.', 'ultimate-member' ),
+ ),
array(
'id' => 'uninstall_on_delete',
'type' => 'checkbox',
diff --git a/includes/class-config.php b/includes/class-config.php
index 58739726..b2daadb1 100644
--- a/includes/class-config.php
+++ b/includes/class-config.php
@@ -510,6 +510,7 @@ if ( ! class_exists( 'um\Config' ) ) {
'category_page_accessible' => 1,
'restricted_access_message' => '',
'restricted_blocks' => 0,
+ 'enable_blocks' => 0,
'restricted_block_message' => '',
'enable_reset_password_limit' => 1,
'reset_password_limit_number' => 3,
diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po
index 95dd0ef6..d8c0cab3 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-03-27 19:18+0200\n"
-"PO-Revision-Date: 2019-03-27 19:18+0200\n"
+"POT-Creation-Date: 2019-03-28 14:53+0200\n"
+"PO-Revision-Date: 2019-03-28 14:53+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en_US\n"
@@ -35,7 +35,7 @@ msgid "Docs"
msgstr ""
#: includes/admin/class-admin.php:308
-#: includes/admin/core/class-admin-settings.php:1162
+#: includes/admin/core/class-admin-settings.php:1168
msgid "Settings"
msgstr ""
@@ -282,29 +282,29 @@ msgstr ""
msgid "Are sure, maybe some settings not saved"
msgstr ""
-#: includes/admin/core/class-admin-enqueue.php:450
+#: includes/admin/core/class-admin-enqueue.php:454
#: includes/core/class-builtin.php:693 includes/core/class-builtin.php:696
#: includes/core/class-builtin.php:1150 includes/core/class-builtin.php:1153
msgid "Password"
msgstr ""
-#: includes/admin/core/class-admin-enqueue.php:454
+#: includes/admin/core/class-admin-enqueue.php:458
#: includes/core/class-account.php:104
msgid "Privacy"
msgstr ""
-#: includes/admin/core/class-admin-enqueue.php:458
+#: includes/admin/core/class-admin-enqueue.php:462
#: includes/core/class-account.php:110
msgid "Notifications"
msgstr ""
-#: includes/admin/core/class-admin-enqueue.php:462
+#: includes/admin/core/class-admin-enqueue.php:466
#: includes/admin/core/list-tables/roles-list-table.php:338
#: includes/admin/core/list-tables/roles-list-table.php:406
msgid "Delete"
msgstr ""
-#: includes/admin/core/class-admin-enqueue.php:507
+#: includes/admin/core/class-admin-enqueue.php:516
msgid "Ultimate Member Blocks"
msgstr ""
@@ -1687,7 +1687,7 @@ msgid ""
msgstr ""
#: includes/admin/core/class-admin-settings.php:436
-#: includes/class-config.php:134 includes/class-config.php:744
+#: includes/class-config.php:134 includes/class-config.php:745
#: includes/core/class-account.php:92
msgid "Account"
msgstr ""
@@ -2377,143 +2377,153 @@ msgid ""
msgstr ""
#: includes/admin/core/class-admin-settings.php:1073
-msgid "Remove Data on Uninstall?"
+msgid "Enable Gutenberg Blocks"
msgstr ""
#: includes/admin/core/class-admin-settings.php:1074
msgid ""
+"Check this box if you would like to use Ultimate Member blocks in Gutenberg "
+"editor. Important some themes have the conflicts with Gutenberg editor."
+msgstr ""
+
+#: includes/admin/core/class-admin-settings.php:1079
+msgid "Remove Data on Uninstall?"
+msgstr ""
+
+#: includes/admin/core/class-admin-settings.php:1080
+msgid ""
"Check this box if you would like Ultimate Member to completely remove all of "
"its data when the plugin/extensions are deleted."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1079
+#: includes/admin/core/class-admin-settings.php:1085
msgid "Install Info"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1193
+#: includes/admin/core/class-admin-settings.php:1199
msgid "Ultimate Member - Settings"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1332
+#: includes/admin/core/class-admin-settings.php:1338
msgid "Save Changes"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1775
+#: includes/admin/core/class-admin-settings.php:1781
msgid "Subject Line"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1777
+#: includes/admin/core/class-admin-settings.php:1783
msgid "This is the subject line of the e-mail"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1782
+#: includes/admin/core/class-admin-settings.php:1788
msgid "Message Body"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1784
+#: includes/admin/core/class-admin-settings.php:1790
msgid "This is the content of the e-mail"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1834
-#: includes/admin/core/class-admin-settings.php:1932
+#: includes/admin/core/class-admin-settings.php:1840
+#: includes/admin/core/class-admin-settings.php:1938
#, php-format
msgid ""
"Your license key expired on %s. Please renew your license key."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1847
-#: includes/admin/core/class-admin-settings.php:1945
+#: includes/admin/core/class-admin-settings.php:1853
+#: includes/admin/core/class-admin-settings.php:1951
#, php-format
msgid ""
"Your license key has been disabled. Please contact support for more information."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1859
-#: includes/admin/core/class-admin-settings.php:1957
+#: includes/admin/core/class-admin-settings.php:1865
+#: includes/admin/core/class-admin-settings.php:1963
#, php-format
msgid ""
"Invalid license. Please visit your account "
"page and verify it."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1872
-#: includes/admin/core/class-admin-settings.php:1970
+#: includes/admin/core/class-admin-settings.php:1878
+#: includes/admin/core/class-admin-settings.php:1976
#, php-format
msgid ""
"Your %s is not active for this URL. Please visit your account page to manage your license key URLs."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1884
-#: includes/admin/core/class-admin-settings.php:1982
+#: includes/admin/core/class-admin-settings.php:1890
+#: includes/admin/core/class-admin-settings.php:1988
#, php-format
msgid "This appears to be an invalid license key for %s."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1893
-#: includes/admin/core/class-admin-settings.php:1991
+#: includes/admin/core/class-admin-settings.php:1899
+#: includes/admin/core/class-admin-settings.php:1997
#, php-format
msgid ""
"Your license key has reached its activation limit. View "
"possible upgrades now."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1902
-#: includes/admin/core/class-admin-settings.php:2000
+#: includes/admin/core/class-admin-settings.php:1908
+#: includes/admin/core/class-admin-settings.php:2006
msgid ""
"The key you entered belongs to a bundle, please use the product specific "
"license key."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1910
-#: includes/admin/core/class-admin-settings.php:1918
+#: includes/admin/core/class-admin-settings.php:1916
+#: includes/admin/core/class-admin-settings.php:1924
msgid "unknown_error"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:1911
-#: includes/admin/core/class-admin-settings.php:1919
+#: includes/admin/core/class-admin-settings.php:1917
+#: includes/admin/core/class-admin-settings.php:1925
#, php-format
msgid ""
"There was an error with this license key: %s. Please contact "
"our support team."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2015
+#: includes/admin/core/class-admin-settings.php:2021
msgid "License key never expires."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2022
+#: includes/admin/core/class-admin-settings.php:2028
#, php-format
msgid ""
"Your license key expires soon! It expires on %s. Renew your license key."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2032
+#: includes/admin/core/class-admin-settings.php:2038
#, php-format
msgid "Your license key expires on %s."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2050
+#: includes/admin/core/class-admin-settings.php:2056
#, php-format
msgid "To receive updates, please enter your valid %s license key."
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2074
+#: includes/admin/core/class-admin-settings.php:2080
msgid "Clear License"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2076
+#: includes/admin/core/class-admin-settings.php:2082
msgid "Activate"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2078
+#: includes/admin/core/class-admin-settings.php:2084
msgid "Re-Activate"
msgstr ""
-#: includes/admin/core/class-admin-settings.php:2130
+#: includes/admin/core/class-admin-settings.php:2136
msgid ""
"To copy the Install info, click below then press Ctrl + C (PC) or Cmd + C "
"(Mac)."
@@ -3902,31 +3912,31 @@ msgstr ""
msgid "Check All"
msgstr ""
-#: includes/class-config.php:129 includes/class-config.php:739
+#: includes/class-config.php:129 includes/class-config.php:740
msgid "User"
msgstr ""
#: includes/class-config.php:130 includes/class-config.php:235
-#: includes/class-config.php:241 includes/class-config.php:740
+#: includes/class-config.php:241 includes/class-config.php:741
msgid "Login"
msgstr ""
#: includes/class-config.php:131 includes/class-config.php:233
-#: includes/class-config.php:245 includes/class-config.php:741
+#: includes/class-config.php:245 includes/class-config.php:742
msgid "Register"
msgstr ""
-#: includes/class-config.php:132 includes/class-config.php:742
+#: includes/class-config.php:132 includes/class-config.php:743
msgid "Members"
msgstr ""
-#: includes/class-config.php:133 includes/class-config.php:743
+#: includes/class-config.php:133 includes/class-config.php:744
#: includes/core/um-actions-profile.php:1080
#: includes/core/um-actions-user.php:15
msgid "Logout"
msgstr ""
-#: includes/class-config.php:135 includes/class-config.php:745
+#: includes/class-config.php:135 includes/class-config.php:746
msgid "Password Reset"
msgstr ""
diff --git a/readme.txt b/readme.txt
index 39a0afe6..b83dca7e 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: 5.1
-Stable tag: 2.0.41
+Stable tag: 2.0.42
License: GNU Version 2 or Any Later Version
License URI: http://www.gnu.org/licenses/gpl-3.0.txt
@@ -133,6 +133,14 @@ 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.42: March 28, 2019 =
+
+* Enhancements:
+ - Added option for enable/disable Gutenberg blocks
+
+* Bugfixes:
+ - Fixed conflicts with themes, which not support custom Gutenberg blocks via the option
+
= 2.0.41: March 27, 2019 =
* Enhancements:
diff --git a/ultimate-member.php b/ultimate-member.php
index 0d84c087..f7bda2a4 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.41
+Version: 2.0.42
Author: Ultimate Member
Author URI: http://ultimatemember.com/
Text Domain: ultimate-member