Merge pull request #762 from kprajapatii/master

1.2.18
AyeCode · Sep 5, 2024 · 9dfeabd · 9dfeabd
2 parents bd5b23f + 5d44450
commit 9dfeabd
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 26 deletions.
diff --git a/languages/userswp-en_US.mo b/languages/userswp-en_US.mo
diff --git a/languages/userswp-en_US.po b/languages/userswp-en_US.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: UsersWP 1.2.17\n"
+"Project-Id-Version: UsersWP 1.2.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-29 22:46+0530\n"
-"PO-Revision-Date: 2024-08-29 22:46+0530\n"
+"POT-Creation-Date: 2024-09-05 20:26+0530\n"
+"PO-Revision-Date: 2024-09-05 20:26+0530\n"
 "Last-Translator: \n"
 "Language-Team: AyeCode Ltd <contact@ayecode.io>\n"
 "Language: en_US\n"

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.ko-fi.com/stiofan
 Tags: login form, registration, registration form, user profile, user registration, members, membership
 Requires at least: 4.9
 Tested up to: 6.6
-Stable tag: 1.2.17
+Stable tag: 1.2.18
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -146,7 +146,7 @@ Yes, you can customize it with Elementor, but also with Gutenberg, Divi, Beaver
 
 == Changelog ==
 
-= 1.2.18 - TBD =
+= 1.2.18 - 2024-09-05 =
 * PHP 8.2 compatibility changes in Emogrifier class to prevent encoding issues - CHANGED
 
 = 1.2.17 - 2024-08-29 =

diff --git a/userswp.php b/userswp.php
@@ -3,7 +3,7 @@
 Plugin Name: UsersWP
 Plugin URI: https://userswp.io/
 Description: The only lightweight user profile plugin for WordPress. UsersWP features front end user profile, users directory, a registration and a login form.
-Version: 1.2.17
+Version: 1.2.18
 Author: AyeCode Ltd
 Author URI: https://userswp.io
 License: GPL-2.0+
@@ -24,7 +24,7 @@
 }
 
 if ( ! defined( 'USERSWP_VERSION' ) ) {
-	define( 'USERSWP_VERSION', '1.2.17' );
+	define( 'USERSWP_VERSION', '1.2.18' );
 }
 
 if ( ! defined( 'USERSWP_PATH' ) ) {

diff --git a/vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php b/vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php
@@ -15,7 +15,7 @@
  */
 add_action('after_setup_theme', function () {
 	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.2.18";
+	$this_version = "0.2.25";
 	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
 		$ayecode_ui_version = $this_version ;
 		$ayecode_ui_file_key = wp_hash( __FILE__ );

diff --git a/vendor/ayecode/wp-ayecode-ui/change-log.txt b/vendor/ayecode/wp-ayecode-ui/change-log.txt
@@ -1,3 +1,6 @@
+= 0.2.25 - 2024-09-05 =
+* Don't apply custom colors to wp-admin - CHANGED
+
 = 0.2.24 - 2024-08-29 =
 * Changes for search form conditional fields - CHANGED
 

diff --git a/vendor/ayecode/wp-ayecode-ui/example-plugin.php b/vendor/ayecode/wp-ayecode-ui/example-plugin.php
@@ -3,7 +3,7 @@
 Plugin Name: AyeCode UI
 Plugin URI: https://ayecode.io/
 Description: This is an example plugin to test AyeCode UI Quickly.
-Version: 0.2.24
+Version: 0.2.25
 Author: AyeCode Ltd
 Author URI: https://userswp.io
 License: GPL-2.0+

diff --git a/vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php b/vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php
@@ -35,7 +35,7 @@ class AyeCode_UI_Settings {
 		 *
 		 * @var string
 		 */
-		public $version = '0.2.24';
+		public $version = '0.2.25';
 
 		/**
 		 * Class textdomain.
@@ -1138,8 +1138,12 @@ public static function custom_css($compatibility = true) {
                         $is_fse = true;
                     }
 
-					if(!empty($colors)){
+                    $custom_admin = $is_fse ? true : apply_filters('ayecode_ui_custom_admin', false );
+
+
+					if(!empty($colors) && $custom_admin ){
 						$d_colors = self::get_colors(true);
+                        //print_r($d_colors);exit;
 
 //						$is_fse = !empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template';
 						foreach($colors as $key => $color ){
@@ -1159,7 +1163,7 @@ public static function custom_css($compatibility = true) {
 						echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
 					}
 
-                    if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' )  ){
+                    if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $custom_admin  ){
                         $css = '';
                         $theme_settings = wp_get_global_styles();
 

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -59,20 +59,20 @@
         },
         {
             "name": "ayecode/wp-ayecode-ui",
-            "version": "0.2.22",
-            "version_normalized": "0.2.22.0",
+            "version": "0.2.25",
+            "version_normalized": "0.2.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AyeCode/wp-ayecode-ui.git",
-                "reference": "42f271602a3ce6b1425dbb7481fcf7ac561250a3"
+                "reference": "1fc1d0e5826988954a297ffc30a5d37486822509"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AyeCode/wp-ayecode-ui/zipball/42f271602a3ce6b1425dbb7481fcf7ac561250a3",
-                "reference": "42f271602a3ce6b1425dbb7481fcf7ac561250a3",
+                "url": "https://api.github.com/repos/AyeCode/wp-ayecode-ui/zipball/1fc1d0e5826988954a297ffc30a5d37486822509",
+                "reference": "1fc1d0e5826988954a297ffc30a5d37486822509",
                 "shasum": ""
             },
-            "time": "2024-08-01T14:41:58+00:00",
+            "time": "2024-09-05T14:29:37+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -101,7 +101,7 @@
             ],
             "support": {
                 "issues": "https://github.com/AyeCode/wp-ayecode-ui/issues",
-                "source": "https://github.com/AyeCode/wp-ayecode-ui/tree/0.2.22"
+                "source": "https://github.com/AyeCode/wp-ayecode-ui/tree/0.2.25"
             },
             "install-path": "../ayecode/wp-ayecode-ui"
         },
@@ -206,24 +206,24 @@
         },
         {
             "name": "ayecode/wp-super-duper",
-            "version": "1.2.6",
-            "version_normalized": "1.2.6.0",
+            "version": "1.2.7",
+            "version_normalized": "1.2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AyeCode/wp-super-duper.git",
-                "reference": "2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc"
+                "reference": "077bbe648ab7b3a9cc77068d2e0c326dfe1a6849"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc",
-                "reference": "2d1626ea3f9f42669e81a4ea4db44572ed2ea1fc",
+                "url": "https://api.github.com/repos/AyeCode/wp-super-duper/zipball/077bbe648ab7b3a9cc77068d2e0c326dfe1a6849",
+                "reference": "077bbe648ab7b3a9cc77068d2e0c326dfe1a6849",
                 "shasum": ""
             },
             "require": {
                 "composer/installers": "~1.0",
                 "php": ">=5.4.0"
             },
-            "time": "2024-07-18T15:16:04+00:00",
+            "time": "2024-08-29T16:44:21+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -255,7 +255,7 @@
             ],
             "support": {
                 "issues": "https://github.com/AyeCode/wp-super-duper/issues",
-                "source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.6"
+                "source": "https://github.com/AyeCode/wp-super-duper/tree/1.2.7"
             },
             "install-path": "../ayecode/wp-super-duper"
         },