Fixes #2872 - returned plugin settings menu to working order

git-svn-id: http://code.elgg.org/elgg/trunk@8107 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 0ec02cded80c12e109f8350c4a509bdcb8f13a9e..77dcb5bd0f1345b3b06e45f5032a95512ebf393a 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -16,22 +16,19 @@
  * @return void
  */
 function elgg_admin_add_plugin_settings_menu() {
-       global $CONFIG;
 
-       if (!$installed_plugins = elgg_get_plugins()) {
+       $active_plugins = elgg_get_plugins('active');
+       if (!$active_plugins) {
                // nothing added because no items
                return FALSE;
        }
 
        elgg_add_admin_menu_item('plugin_settings', elgg_echo('admin:plugin_settings'));
 
-       foreach ($installed_plugins as $plugin_id => $info) {
-               if (!$info['active']) {
-                       continue;
-               }
-
-               if (elgg_view_exists("settings/{$plugin_id}/edit")) {
-                       elgg_add_admin_menu_item($plugin_id, $info['manifest']['name'], 'plugin_settings');
+       foreach ($active_plugins as $plugin) {
+               $plugin_id = $plugin->getID();
+               if (elgg_view_exists("settings/$plugin_id/edit")) {
+                       elgg_add_admin_menu_item($plugin_id, $plugin->manifest->getName(), 'plugin_settings');
                }
        }
 }