From 4c437240f79fdd23beee182a31001954b4f64be4 Mon Sep 17 00:00:00 2001 From: nikitasinelnikov Date: Tue, 10 Dec 2019 14:04:13 +0200 Subject: [PATCH] - added Profile Tabs licenses integration; - fixed issue with the filter on change enqueue scripts priority; --- assets/img/extensions/profile-tabs.png | Bin 0 -> 3156 bytes includes/admin/templates/extensions.php | 6 ++++++ includes/class-dependencies.php | 3 ++- includes/class-init.php | 1 + includes/core/class-enqueue.php | 23 +++++++++++++++++++---- includes/core/class-plugin-updater.php | 6 +++++- readme.txt | 1 + 7 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 assets/img/extensions/profile-tabs.png diff --git a/assets/img/extensions/profile-tabs.png b/assets/img/extensions/profile-tabs.png new file mode 100644 index 0000000000000000000000000000000000000000..2c45ca7ffebea332a8aea3388cb6004b4ea177e4 GIT binary patch literal 3156 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 literal 0 HcmV?d00001 diff --git a/includes/admin/templates/extensions.php b/includes/admin/templates/extensions.php index 420484b9..d54df331 100644 --- a/includes/admin/templates/extensions.php +++ b/includes/admin/templates/extensions.php @@ -128,6 +128,12 @@ $premium['unsplash'] = array( 'desc' => 'Allow users to select a profile cover photo from Unsplash from their profile', ); +$premium['profile-tabs'] = array( + 'url' => 'https://ultimatemember.com/extensions/profile-tabs/', + 'name' => 'Profile Tabs', + 'desc' => 'Allow users to add custom tabs to profiles', +); + $free['forumwp'] = array( 'url' => 'https://ultimatemember.com/extensions/forumwp/', 'name' => 'ForumWP', diff --git a/includes/class-dependencies.php b/includes/class-dependencies.php index 315a3759..a75b4495 100644 --- a/includes/class-dependencies.php +++ b/includes/class-dependencies.php @@ -47,6 +47,7 @@ if ( ! class_exists( 'um\Dependencies' ) ) { 'online' => '2.1.1', 'private-content' => '2.0.5', 'profile-completeness' => '2.1.2', + 'profile-tabs' => '1.0.0', 'recaptcha' => '2.1.2', 'reviews' => '2.1.5', 'social-activity' => '2.2.0', @@ -64,7 +65,7 @@ if ( ! class_exists( 'um\Dependencies' ) ) { /*rc*/ 'user-notes' => '2.0', - 'profile-tabs' => '1.6', + /*beta*/ 'frontend-posting' => '1.0', diff --git a/includes/class-init.php b/includes/class-init.php index 5397c187..e50c75e7 100644 --- a/includes/class-init.php +++ b/includes/class-init.php @@ -37,6 +37,7 @@ if ( ! class_exists( 'UM' ) ) { * @method UM_User_Bookmarks User_Bookmarks() * @method UM_Unsplash Unsplash() * @method UM_ForumWP ForumWP() + * @method UM_Profile_Tabs Profile_Tabs() */ final class UM extends UM_Functions { diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php index 3a815b8a..dbe487fd 100644 --- a/includes/core/class-enqueue.php +++ b/includes/core/class-enqueue.php @@ -43,6 +43,22 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { $this->js_baseurl = um_url . 'assets/js/'; $this->css_baseurl = um_url . 'assets/css/'; + add_action( 'init', array( &$this, 'scripts_enqueue_priority' ) ); + } + + + /** + * + */ + function scripts_enqueue_priority() { + add_action( 'wp_enqueue_scripts', array( &$this, 'wp_enqueue_scripts' ), $this->get_priority() ); + } + + + /** + * @return int + */ + function get_priority() { /** * UM hook * @@ -63,8 +79,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { * } * ?> */ - $priority = apply_filters( 'um_core_enqueue_priority', 100 ); - add_action( 'wp_enqueue_scripts', array( &$this, 'wp_enqueue_scripts' ), $priority ); + return apply_filters( 'um_core_enqueue_priority', 100 ); } @@ -80,7 +95,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_dequeue_script( 'select2'); wp_deregister_script('select2'); } - wp_register_script( 'select2', $this->js_baseurl . 'select2/select2.full.min.js', array( 'jquery', 'jquery-masonry' ), ultimatemember_version, true ); + wp_register_script( 'select2', $this->js_baseurl . 'select2/select2.full.min.js', array( 'jquery' ), ultimatemember_version, true ); wp_register_script( 'um_scrollbar', $this->js_baseurl . 'simplebar' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); @@ -141,7 +156,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_script('um_dropdown', $this->js_baseurl . 'dropdown' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); - wp_register_script('um_members', $this->js_baseurl . 'um-members' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks', 'jquery-masonry' ), ultimatemember_version, true ); + wp_register_script('um_members', $this->js_baseurl . 'um-members' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'jquery-ui-slider', 'um_dropdown', 'wp-hooks', 'jquery-masonry', 'um_scripts' ), ultimatemember_version, true ); wp_register_script('um_profile', $this->js_baseurl . 'um-profile' . $this->suffix . '.js', array( 'jquery', 'wp-util', 'wp-i18n' ), ultimatemember_version, true ); wp_register_script('um_account', $this->js_baseurl . 'um-account' . $this->suffix . '.js', array( 'jquery' ), ultimatemember_version, true ); diff --git a/includes/core/class-plugin-updater.php b/includes/core/class-plugin-updater.php index b6c7bbe2..1e3e198b 100644 --- a/includes/core/class-plugin-updater.php +++ b/includes/core/class-plugin-updater.php @@ -159,10 +159,14 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) { 'key' => 'filesharing', 'title' => 'File Sharing', ), - 'um-user-location/um-user-location.php' => array( + 'um-user-location/um-user-location.php' => array( 'key' => 'user-location', 'title' => 'User Location', ), + 'um-profile-tabs/um-profile-tabs.php' => array( + 'key' => 'profile_tabs', + 'title' => 'Profile tabs', + ), ); $active_um_plugins = array(); diff --git a/readme.txt b/readme.txt index b1e54b9c..0ec16527 100644 --- a/readme.txt +++ b/readme.txt @@ -42,6 +42,7 @@ Read about all of the plugin's features at [Ultimate Member](https://ultimatemem Ultimate Member has a range of extensions that allow you to extend the power of the plugin. You can purchase all of these extensions at a significant discount with our [All Access Pass](https://ultimatemember.com/pricing/) or you can purchase extensions individually. +* [Profile Tabs](https://ultimatemember.com/extensions/profile-tabs/) - Allow users to add custom tabs to profiles * [Unsplash](https://ultimatemember.com/extensions/unsplash/) - Allow users to select a profile cover photo from [Unsplash](https://unsplash.com/) from their profile * [User Bookmarks](https://ultimatemember.com/extensions/user-bookmarks/) - Allow users to bookmark content from your website * [User Photos](https://ultimatemember.com/extensions/user-photos/) - Allow users to upload photos to their profile