From 1277e300e786d03125621953679171709c6273f1 Mon Sep 17 00:00:00 2001
From: Scott DeLuzio <scott@surpriseazwebservices.com>
Date: Tue, 7 May 2019 13:01:25 -0700
Subject: [PATCH] Fixed issue where deactivate_plugins() function was called
 too early causing errors in some cases.

---
 includes/wcs-updates.php     | 2 +-
 js/dashboard-address-book.js | 4 ++--
 readme.txt                   | 8 +++++---
 wp-crm-system.php            | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/includes/wcs-updates.php b/includes/wcs-updates.php
index 44f6941..2d61744 100644
--- a/includes/wcs-updates.php
+++ b/includes/wcs-updates.php
@@ -77,4 +77,4 @@ function wp_crm_system_remove_merged_premium_addons(){
 	);
 	deactivate_plugins( $plugins );
 }
-add_action( 'plugins_loaded', 'wp_crm_system_remove_merged_premium_addons', 1 );
\ No newline at end of file
+add_action( 'admin_init', 'wp_crm_system_remove_merged_premium_addons', 1 );
\ No newline at end of file
diff --git a/js/dashboard-address-book.js b/js/dashboard-address-book.js
index c9036ae..ff68045 100644
--- a/js/dashboard-address-book.js
+++ b/js/dashboard-address-book.js
@@ -1,7 +1,7 @@
 jQuery(document).ready(function($) {
 	$('#dashboard-address-book').change(function() {
 		$('#address_book_loading').show();
-				
+
 		data = {
 			action: 'address_book_response',
 			address_book_nonce: address_book_vars.address_book_nonce,
@@ -29,7 +29,7 @@ jQuery(document).ready(function($) {
 				},
 			});
 		});
-		
+
 		return false;
 	});
 });
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 0913ef1..c47cd47 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: scott.deluzio
 Tags:  WordPress CRM, Free CRM for WordPress, CRM, Free WordPress CRM, CRM for WordPress, gdpr
 Requires at least: 3.3.0
 Tested up to: 5.2.0
-Stable tag: 3.0.1
+Stable tag: 3.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -91,6 +91,8 @@ Absolutely. There are inexpensive extensions that allow you to import as little
 Your data is only accessible through the WordPress CRM dashboard. None of it will be accessible through the public facing portion of your website unless you are using our GDPR features (see above). This allows you to provide access to as few or as many people as you need to.
 
 == Changelog ==
+= 3.0.2 =
+* Fixed issue where `deactivate_plugins()` function was called too early causing errors in some cases.
 = 3.0.1 =
 * Fixed duplicate function name error when WP-CRM System and Email Notifications were active at the same time.
 = 3.0.0 =
@@ -352,5 +354,5 @@ Your data is only accessible through the WordPress CRM dashboard. None of it wil
 * Initial Release
 
 == Upgrade Notice ==
-= 3.0.1 =
-* Fixed duplicate function name error when WP-CRM System and Email Notifications were active at the same time.
\ No newline at end of file
+= 3.0.2 =
+* Fixed issue where `deactivate_plugins()` function was called too early causing errors in some cases.
\ No newline at end of file
diff --git a/wp-crm-system.php b/wp-crm-system.php
index 00fc55d..87b3ea7 100644
--- a/wp-crm-system.php
+++ b/wp-crm-system.php
@@ -3,7 +3,7 @@
 Plugin Name: WP-CRM System
 Plugin URI: https://www.wp-crm.com
 Description: A complete CRM for WordPress
-Version: 3.0.1
+Version: 3.0.2
 Author: Scott DeLuzio
 Author URI: https://www.wp-crm.com
 Text Domain: wp-crm-system
@@ -34,7 +34,7 @@ function wp_crm_plugin_init() {
   define( 'WP_CRM_SYSTEM', __FILE__ );
 }
 if ( ! defined( 'WP_CRM_SYSTEM_VERSION' ) ) {
-  define( 'WP_CRM_SYSTEM_VERSION', '3.0.1' );
+  define( 'WP_CRM_SYSTEM_VERSION', '3.0.2' );
 }
 if( ! defined( 'WP_CRM_SYSTEM_URL' ) ) {
 	define( 'WP_CRM_SYSTEM_URL', plugins_url( '', __FILE__ ) );