Fix possible conflict with other plugins

wpcodefactory · Aug 31, 2024 · fa231b3 · fa231b3
1 parent 62d0bc6
commit fa231b3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/popup-notices-for-woocommerce.php b/popup-notices-for-woocommerce.php
@@ -3,14 +3,14 @@
  * Plugin Name: Popups for WooCommerce: Add to Cart, Checkout & More
  * Plugin URI: https://wordpress.org/plugins/popup-notices-for-woocommerce
  * Description: Turn your WooCommerce Notices into Popups
- * Version: 1.4.10
+ * Version: 1.5.0
  * Author: WPFactory
  * Author URI: https://wpfactory.com
  * License: GNU General Public License v3.0
  * License URI: http://www.gnu.org/licenses/gpl-3.0.html
  * Text Domain: popup-notices-for-woocommerce
  * Domain Path: /src/languages
- * Copyright: © 2023 WPFactory
+ * Copyright: © 2024 WPFactory
  * WC requires at least: 3.0.0
  * WC tested up to: 9.1
  * Requires Plugins: woocommerce

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: wpcodefactory, omardabbas, karzin, anbinder, algoritmika, kousikmu
 Tags: popup,notices,woocommerce,notice,modal
 Requires at least: 6.1
 Tested up to: 6.6
-Stable tag: 1.4.10
+Stable tag: 1.5.0
 Requires PHP: 5.6.0
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -165,6 +165,9 @@ Once activated, access the plugin's settings by navigating to “WooCommerce > S
 
 == Changelog ==
 
+= 1.5.0 - 31/08/2024 =
+* Dev - Prevented possible conflicts with other plugins such as "Quick Buy Now Button for WooCommerce".
+
 = 1.4.10 - 31/07/2024 =
 * WC tested up to: 9.1.
 * Tested up to: 6.6.

diff --git a/src/php/class-core.php b/src/php/class-core.php
@@ -2,7 +2,7 @@
 /**
  * Pop-up Notices for WooCommerce (TTT) - Core Class
  *
- * @version 1.4.7
+ * @version 1.5.0
  * @since   1.0.0
  * @author  WPFactory
  */
@@ -522,14 +522,19 @@ public function localize_js_options( $data ) {
 		/**
 		 * Creates admin settings.
 		 *
-		 * @version 1.0.0
-		 * @since 1.0.0
+		 * @version 1.5.0
+		 * @since   1.0.0
 		 *
 		 * @param $settings
 		 *
 		 * @return mixed
 		 */
 		public function create_admin_settings( $settings ) {
+			if ( is_object( ( $settings ) ) ) {
+				$obj        = $settings;
+				$settings   = array();
+				$settings[] = $obj;
+			}
 			$settings[] = new Admin_Settings();
 
 			return $settings;

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'wpfactory/popup-notices-for-woocommerce',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'b0825b02b34849fc8edbe638a24afca1652d9a2a',
+        'reference' => '62d0bc6995f703ead17f38712a11140b756d8b35',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'wpfactory/popup-notices-for-woocommerce' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'b0825b02b34849fc8edbe638a24afca1652d9a2a',
+            'reference' => '62d0bc6995f703ead17f38712a11140b756d8b35',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),