Fixes #4383 hard codes bundled plugin list and also removes really ugly color for...

diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
index 7aa702d4750e947f03912cfb735f133ee0ab1435..7e79c15c8f9a82f3208aafd88b28cf105541f1cf 100644 (file)
--- a/engine/classes/ElggPluginManifest.php
+++ b/engine/classes/ElggPluginManifest.php
@@ -319,12 +319,26 @@ class ElggPluginManifest {
         * @return array
         */
        public function getCategories() {
+               $bundled_plugins = array('blog', 'bookmarks', 'categories',
+                       'custom_index', 'dashboard', 'developers', 'diagnostics',
+                       'embed', 'externalpages', 'file', 'garbagecollector',
+                       'groups', 'htmlawed', 'invitefriends', 'likes',
+                       'logbrowser', 'logrotate', 'members', 'messageboard',
+                       'messages', 'notifications', 'oauth_api', 'pages', 'profile',
+                       'reportedcontent', 'search', 'tagcloud', 'thewire', 'tinymce',
+                       'twitter', 'twitter_api', 'uservalidationbyemail', 'zaudio',
+               );
+
                $cats = $this->parser->getAttribute('category');
 
                if (!$cats) {
                        $cats = array();
                }
 
+               if (in_array('bundled', $cats) && !in_array($this->getPluginID(), $bundled_plugins)) {
+                       unset($cats[array_search('bundled', $cats)]);
+               }
+
                return $cats;
        }
 

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index e3205ca4e2c7c4fc792e1ce9423bb1095ded31a1..65797172f2f3781a85fcd5ea50213676ddea6425 100644 (file)
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1267,7 +1267,7 @@ ul.elgg-plugin-categories, ul.elgg-plugin-categories > li {
 }
 .elgg-plugin-category-bundled {
        border-width: 2px;
-       border-color: #DAA520;
+       border-color: #0054A7;
 }
 
 /****************************************