Merge pull request #421 from addonify/development

Fix PHP error
addonify · Oct 18, 2023 · 72a280c · 72a280c
2 parents d978882 + 7c1dbfe
commit 72a280c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/README.txt b/README.txt
@@ -4,7 +4,7 @@ Contributors: addonify
 Tags: wishlist, woocommerce wishlist, product wishlist, woocommerce, ecommerce, e-commerce
 Requires at least: 5.9
 Tested up to: 6.3.2
-Stable tag: 2.0.6
+Stable tag: 2.0.7
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -140,6 +140,11 @@ You can use this `[addonify_wishlist]` shortcode to display the wishlist table i
 
 == Changelog ==
 
+= 2.0.7 - 18 October, 2023 =
+
+- Fix:    PHP error while activating the plugin.
+- Tested: WooCommerce 8.2.1
+
 = 2.0.6 - 16 October, 2023 =
 
 - Added:   Confirmation modal when trying to empty wishlist and new options for popup notice's messages.

diff --git a/addonify-wishlist.php b/addonify-wishlist.php
@@ -10,7 +10,7 @@
  * Plugin Name:       Addonify - WooCommerce Wishlist
  * Plugin URI:        https://wordpress.org/plugins/addonify-wishlist
  * Description:       Addonify WooCommerce Wishlist is a light-weight yet powerful tool that adds a wishlist functionality to your e-commerce shop.
- * Version:           2.0.6
+ * Version:           2.0.7
  * Requires at least: 5.9
  * Requires PHP:      7.4
  * Author:            Addonify
@@ -26,7 +26,7 @@
 	die;
 }
 
-define( 'ADDONIFY_WISHLIST_VERSION', '2.0.6' );
+define( 'ADDONIFY_WISHLIST_VERSION', '2.0.7' );
 define( 'ADDONIFY_WISHLIST_DB_INITIALS', 'addonify_wishlist_' );
 define( 'ADDONIFY_WISHLIST_PLUGIN_PATH', dirname( __FILE__ ) );
 define( 'ADDONIFY_WISHLIST_PLUGIN_FILE', __FILE__ );

diff --git a/includes/class-addonify-wishlist-activator.php b/includes/class-addonify-wishlist-activator.php
@@ -28,6 +28,8 @@ class Addonify_Wishlist_Activator {
 	 */
 	public static function activate() {
 
+		require plugin_dir_path( dirname( __FILE__ ) ) . 'includes/addonify-wishlist-user-meta-functions.php';
+
 		require plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-addonify-wishlist-database-handler.php';
 
 		$database_handler = new Addonify_Wishlist_Database_Handler();

diff --git a/includes/class-addonify-wishlist.php b/includes/class-addonify-wishlist.php
@@ -118,10 +118,6 @@ public function __construct() {
 	 */
 	private function load_dependencies() {
 
-		require plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-addonify-wishlist-database-handler.php';
-
-		$database_handler = new Addonify_Wishlist_Database_Handler();
-
 		/**
 		 * The class responsible for orchestrating the actions and filters of the
 		 * core plugin.
@@ -136,6 +132,10 @@ private function load_dependencies() {
 
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/addonify-wishlist-user-meta-functions.php';
 
+		require plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-addonify-wishlist-database-handler.php';
+
+		$database_handler = new Addonify_Wishlist_Database_Handler();
+
 		$this->wishlist_table_exists = $database_handler->check_wishlist_table_exists();
 
 		if ( $this->wishlist_table_exists ) {