diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-04 03:12:48 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-04 03:12:48 +0000 |
| commit | 780723dfae9d9c910dfdb6a9e244fce738942e3b (patch) | |
| tree | c305a6bcdc777183847993814b7d5e511cfcf81d /engine/lib/deprecated-1.8.php | |
| parent | 77c4fd10bc965499d6ad58c49ea17dab9414bb44 (diff) | |
| download | elgg-780723dfae9d9c910dfdb6a9e244fce738942e3b.tar.gz elgg-780723dfae9d9c910dfdb6a9e244fce738942e3b.tar.bz2 | |
Fixes #2820, Fixes #2823. Using elgg_get_plugins() in elgg_get_plugins_provides(). Fixed plugin conflicts system. Removed cruft from ElggPluginPackage. Fixed deprecated get_installed_plugins() to honor the type requested.
git-svn-id: http://code.elgg.org/elgg/trunk@8010 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/deprecated-1.8.php')
| -rw-r--r-- | engine/lib/deprecated-1.8.php | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php index dbe53c115..3db32c522 100644 --- a/engine/lib/deprecated-1.8.php +++ b/engine/lib/deprecated-1.8.php @@ -49,7 +49,7 @@ function register_action($action, $public = false, $filename = "", $admin_only = * @param int $priority Optional priority to govern the appearance in the list. * * @deprecated 1.8 Extend admin views manually - * + * * @return void */ function extend_elgg_admin_page($new_admin_view, $view = 'admin/main', $priority = 500) { @@ -1162,7 +1162,7 @@ function list_entities_from_metadata($meta_name, $meta_value = "", $entity_type * @param bool $pagination Display pagination? Default: true * * @return string List of ElggEntities suitable for display - * + * * @deprecated 1.8 Use elgg_list_entities_from_metadata() instead */ function list_entities_from_metadata_multi($meta_array, $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = true, $pagination = true) { @@ -1610,10 +1610,20 @@ function get_installed_plugins($status = 'all') { continue; } - $installed_plugins[$plugin->getID()] = array( - 'active' => $plugin->isActive(), - 'manifest' => $plugin->manifest->getManifest() - ); + $include = true; + + if ($status == 'enabled' && !$plugin->isActive()) { + $include = false; + } elseif ($status == 'disabled' && $plugin->isActive()) { + $include = true; + } + + if ($include) { + $installed_plugins[$plugin->getID()] = array( + 'active' => $plugin->isActive(), + 'manifest' => $plugin->manifest->getManifest() + ); + } } return $installed_plugins; @@ -2396,7 +2406,7 @@ $owner_guid = "", $owner_relationship = "") { * @param string $password The password, optionally (for standard logins) * * @return ElggUser|false The authenticated user object, or false on failure. - * + * * @deprecated 1.8 Use elgg_authenticate */ function authenticate($username, $password) { @@ -2468,7 +2478,7 @@ function list_site_members($site_guid, $limit = 10, $fullview = true) { * @param int $collection_guid Collection GUID * * @return mixed - * @deprecated 1.8 + * @deprecated 1.8 */ function add_site_collection($site_guid, $collection_guid) { elgg_deprecated_notice("add_site_collection has been deprecated", 1.8); |