From: Matt Beckett <beck24@gmail.com>
Date: Thu, 24 Oct 2013 06:42:30 +0000 (-0700)
Subject: Revert "move deactivate event registration to the user-triggered action"
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=db9153b12101da7836d6ef0d748fb11eee335d9b;p=lorea%2Felgg.git

Revert "move deactivate event registration to the user-triggered action"

This reverts commit 6da43b70ca0de807c0532adb0bba65405d3ffbc1.
---

diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index adb86dd7a..354f4717d 100644
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -10,9 +10,6 @@
  * @package Elgg.Core
  * @subpackage Administration.Plugins
  */
- 
- // prevent disabling plugins with active dependents
- elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 $plugin_guids = get_input('plugin_guids');
 
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 1b7ad5db9..e0aa705bb 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -1148,6 +1148,8 @@ function plugin_init() {
 	run_function_once("plugin_run_once");
 
 	elgg_register_plugin_hook_handler('unit_test', 'system', 'plugins_test');
+	
+	elgg_register_event_handler('deactivate', 'plugin', 'plugins_deactivate_dependency_check');
 
 	elgg_register_action("plugins/settings/save", '', 'admin');
 	elgg_register_action("plugins/usersettings/save");