diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-01 23:20:47 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-01 23:20:47 +0200 |
| commit | 671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2 (patch) | |
| tree | 436b0de846650bce13436b51a2d5214224f8898c /engine/classes | |
| parent | 3da3f2aa28a42c23bdc9d661e7e13fd6f2bd2b10 (diff) | |
| parent | b91d8bb0fea5cef9fafea72181a0007cfaa54725 (diff) | |
| download | elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.gz elgg-671f9ba4e1b1972d8eaf22acfb626fa2c85af0f2.tar.bz2 | |
Upgraded to Elgg 1.8.6.
Merge tag '1.8.6' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.6 release
Diffstat (limited to 'engine/classes')
| -rw-r--r-- | engine/classes/ElggPluginManifest.php | 14 | ||||
| -rw-r--r-- | engine/classes/ElggSite.php | 1 |
2 files changed, 15 insertions, 0 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/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 6d07778a9..e793ab9c6 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -423,6 +423,7 @@ class ElggSite extends ElggEntity { // default public pages $defaults = array( 'walled_garden/.*', + 'login', 'action/login', 'register', 'action/register', |