Merge pull request #2410 from woocommerce/fix/woocommerce-disabled-fatal

Fix: Exit deactivate early if WooCommerce not active.
woocommerce · Jun 13, 2019 · b566d0c · b566d0c
2 parents f16f6b9 + accce7f
commit b566d0c
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/woocommerce-admin.php b/woocommerce-admin.php
@@ -78,6 +78,12 @@ public function on_activation() {
 	 * @return void
 	 */
 	public function on_deactivation() {
+		// Check if we are deactivating due to dependencies not being satisfied.
+		// If WooCommerce is disabled we can't include files that depend upon it.
+		if ( ! $this->check_dependencies() ) {
+			return;
+		}
+
 		$this->includes();
 		WC_Admin_Reports_Sync::clear_queued_actions();
 		WC_Admin_Notes::clear_queued_actions();