Merge pull request #13056 from jeabakker/plugin-cache-flush

fix(plugins): correctly flush caches after plugin (de)activation
Elgg · Jan 24, 2020 · 5fced49 · 5fced49
2 parents 99c65f9 + 7a6465b
commit 5fced49
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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");