aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-06-17 08:26:21 -0400
committerCash Costello <cash.costello@gmail.com>2012-06-17 08:26:21 -0400
commitf817ef90978ba19aee2273872ff2d75c4b4c2c65 (patch)
tree2633f83a5f84fb8ad329c1ddec30c0eb13fb5da9
parent3f42ca11e752696d9aaafe9b006d8e0f07136928 (diff)
downloadelgg-f817ef90978ba19aee2273872ff2d75c4b4c2c65.tar.gz
elgg-f817ef90978ba19aee2273872ff2d75c4b4c2c65.tar.bz2
Fixes #4383 hard codes bundled plugin list and also removes really ugly color for highlighting them in plugin list
-rw-r--r--engine/classes/ElggPluginManifest.php14
-rw-r--r--views/default/css/admin.php2
2 files changed, 15 insertions, 1 deletions
diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
index 7aa702d47..7e79c15c8 100644
--- 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 e3205ca4e..65797172f 100644
--- 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;
}
/****************************************