Fixes #3623 added non-bundled filter option for plugins

diff --git a/languages/en.php b/languages/en.php
index ab3c523def095b6859593284b59dc365aeacdc4d..6e07b256b76c597f0fc6bebf81710fe3dd02389c 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -601,6 +601,7 @@ $english = array(
        'admin:plugins:category:inactive' => 'Inactive plugins',
        'admin:plugins:category:admin' => 'Admin',
        'admin:plugins:category:bundled' => 'Bundled',
+       'admin:plugins:category:nonbundled' => 'Non-bundled',
        'admin:plugins:category:content' => 'Content',
        'admin:plugins:category:development' => 'Development',
        'admin:plugins:category:enhancement' => 'Enhancements',

diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index cd0b83c001b19505faf54b72ab739185b0208560..62e6f556a5e208404fc03cc201d49c7846a0b773 100644 (file)
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -45,6 +45,11 @@ foreach ($installed_plugins as $id => $plugin) {
                                unset($installed_plugins[$id]);
                        }
                        break;
+               case 'nonbundled':
+                       if (in_array('bundled', $plugin_categories)) {
+                               unset($installed_plugins[$id]);
+                       }
+                       break;
                default:
                        if (!in_array($show_category, $plugin_categories)) {
                                unset($installed_plugins[$id]);
@@ -96,10 +101,16 @@ switch ($sort) {
 
 asort($categories);
 
+// we want bundled/nonbundled pulled to be at the top of the list
+unset($categories['bundled']);
+unset($categories['nonbundled']);
+
 $common_categories = array(
        'all' => elgg_echo('admin:plugins:category:all'),
        'active' => elgg_echo('admin:plugins:category:active'),
        'inactive' => elgg_echo('admin:plugins:category:inactive'),
+       'bundled' => elgg_echo('admin:plugins:category:bundled'),
+       'nonbundled' => elgg_echo('admin:plugins:category:nonbundled'),
 );
 
 $categories = array_merge($common_categories, $categories);