From 7a6465b52366e02abab3216772e8f96e523b9dd6 Mon Sep 17 00:00:00 2001
From: Jerome Bakker <jeabakker@coldtrick.com>
Date: Fri, 24 Jan 2020 14:59:08 +0100
Subject: [PATCH] fix(plugins): correctly flush caches after plugin
 (de)activation

---
 engine/classes/ElggPlugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index 9dcce38a590..bb1d91c0aa8 100644
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -664,7 +664,7 @@ public function activate() {
 		// Note: this will not run re-run the init hooks!
 		if ($return) {
 			try {
-				_elgg_services()->events->trigger('cache:flush', 'system');
+				elgg_flush_caches();
 
 				$this->register();
 				
@@ -696,7 +696,7 @@ public function activate() {
 		} else {
 			elgg_delete_admin_notice("cannot_start {$this->getID()}");
 
-			_elgg_services()->events->trigger('cache:flush', 'system');
+			elgg_flush_caches();
 			_elgg_services()->logger->notice("Plugin {$this->getID()} has been activated");
 		}
 
@@ -793,7 +793,7 @@ public function deactivate() {
 
 		$this->deactivateEntities();
 
-		_elgg_services()->events->trigger('cache:flush', 'system');
+		elgg_flush_caches();
 
 		_elgg_services()->logger->notice("Plugin {$this->getID()} has been deactivated");