diff options
| author | beck24 <beck24@gmail.com> | 2013-10-13 21:51:02 -0700 |
|---|---|---|
| committer | beck24 <beck24@gmail.com> | 2013-10-13 21:51:02 -0700 |
| commit | 6da43b70ca0de807c0532adb0bba65405d3ffbc1 (patch) | |
| tree | a8095679be149aa476dbb6beff88ef0b82760d7f | |
| parent | 634216f0978d037fb84ef8e68e4e4272752c22fb (diff) | |
| download | elgg-6da43b70ca0de807c0532adb0bba65405d3ffbc1.tar.gz elgg-6da43b70ca0de807c0532adb0bba65405d3ffbc1.tar.bz2 | |
move deactivate event registration to the user-triggered action
| -rw-r--r-- | actions/admin/plugins/deactivate.php | 3 | ||||
| -rw-r--r-- | engine/lib/plugins.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php index 354f4717d..adb86dd7a 100644 --- a/actions/admin/plugins/deactivate.php +++ b/actions/admin/plugins/deactivate.php @@ -10,6 +10,9 @@ * @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 e0aa705bb..1b7ad5db9 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -1148,8 +1148,6 @@ 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"); |