From f2123cdc42c8da21a297158fbb655f72bc92edce Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 5 Jan 2011 04:36:07 +0000 Subject: Fixes #2760. Refs #2759. Updated plugin admin actions to use the new system. Added plugin dependency views in admin. ElggPluginPackage->checkDependencies() now returns the detected value. git-svn-id: http://code.elgg.org/elgg/trunk@7838 36083f99-b078-4883-b0ff-0f9b5a30f544 --- actions/admin/plugins/simple_update_states.php | 38 ++++++++++++-------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'actions/admin/plugins/simple_update_states.php') diff --git a/actions/admin/plugins/simple_update_states.php b/actions/admin/plugins/simple_update_states.php index 7d01e4a46..216a458f4 100644 --- a/actions/admin/plugins/simple_update_states.php +++ b/actions/admin/plugins/simple_update_states.php @@ -1,48 +1,44 @@ $info) { +foreach ($installed_plugins as $plugin) { // this is only for simple plugins. - $interface_type = elgg_get_array_value('admin_interface', $info['manifest'], NULL); - if (!$interface_type || $interface_type != 'simple') { + if ($plugin->manifest->getAdminInterface() != 'simple') { continue; } - $plugin_enabled = is_plugin_enabled($plugin); - // only effect changes to plugins not already in that state. - if ($plugin_enabled && !in_array($plugin, $enabled_plugins)) { - $success = $success && disable_plugin($plugin); - } elseif (!$plugin_enabled && in_array($plugin, $enabled_plugins)) { - $success = $success && enable_plugin($plugin); + if ($plugin->isActive() && !in_array($plugin->guid, $active_plugin_guids)) { + $success = $success && $plugin->deactivate(); + } elseif (!$plugin->isActive() && in_array($plugin->guid, $active_plugin_guids)) { + $success = $success && $plugin->activate(); } } if ($success) { elgg_delete_admin_notice('first_installation_plugin_reminder'); - system_message(elgg_echo('admin:plugins:simple_simple_success')); + //system_message(elgg_echo('admin:plugins:simple_simple_success')); } else { - register_error(elgg_echo('admins:plugins:simple_simple_fail')); + register_error(elgg_echo('admin:plugins:simple_simple_fail')); } // don't regenerate the simplecache because the plugin won't be -- cgit v1.2.3