diff options
| -rw-r--r-- | engine/lib/input.php | 2 | ||||
| -rw-r--r-- | engine/lib/upgrades/2010050701.php | 2 | ||||
| -rw-r--r-- | engine/lib/upgrades/2010100500.php | 2 | ||||
| -rw-r--r-- | mod/embed/views/default/embed/embed.php | 2 | ||||
| -rw-r--r-- | mod/embed/views/default/embed/link.php | 2 | ||||
| -rw-r--r-- | mod/notifications/start.php | 2 | ||||
| -rw-r--r-- | mod/sitepages/index.php | 2 | ||||
| -rw-r--r-- | mod/thewire/start.php | 2 | ||||
| -rw-r--r-- | mod/twitterservice/start.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/tools.php | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/engine/lib/input.php b/engine/lib/input.php index 624c6111e..db43f9a24 100644 --- a/engine/lib/input.php +++ b/engine/lib/input.php @@ -275,7 +275,7 @@ function input_livesearch_page_handler($page) { case 'groups': // don't return results if groups aren't enabled. - if (!is_plugin_enabled('groups')) { + if (!elgg_is_active_plugin('groups')) { continue; } $query = "SELECT * FROM {$CONFIG->dbprefix}groups_entity as ge, {$CONFIG->dbprefix}entities as e diff --git a/engine/lib/upgrades/2010050701.php b/engine/lib/upgrades/2010050701.php index 4a02a77c6..554e10d8a 100644 --- a/engine/lib/upgrades/2010050701.php +++ b/engine/lib/upgrades/2010050701.php @@ -5,7 +5,7 @@ $access = elgg_set_ignore_access(TRUE); -if (is_plugin_enabled('walledgarden')) { +if (elgg_is_active_plugin('walledgarden')) { disable_plugin('walledgarden'); set_config('allow_registration', FALSE); set_config('walled_garden', TRUE); diff --git a/engine/lib/upgrades/2010100500.php b/engine/lib/upgrades/2010100500.php index 1f9587196..74d1be820 100644 --- a/engine/lib/upgrades/2010100500.php +++ b/engine/lib/upgrades/2010100500.php @@ -3,7 +3,7 @@ * Upgrades the oAuth Library plugin name */ -if (is_plugin_enabled('oauth')) { +if (elgg_is_active_plugin('oauth')) { disable_plugin('oauth'); enable_plugin('oauth_lib'); } diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php index 7e84a9d72..e839450da 100644 --- a/mod/embed/views/default/embed/embed.php +++ b/mod/embed/views/default/embed/embed.php @@ -87,7 +87,7 @@ if (!$sections) { // pull out some common tests // embed requires ECML, but until we have plugin deps working // we need to explicitly check and use a fallback. - if ($ecml_enabled = is_plugin_enabled('ecml')){ + if ($ecml_enabled = elgg_is_active_plugin('ecml')){ $ecml_valid_keyword = ecml_is_valid_keyword($active_section); } else { $ecml_valid_keyword = FALSE; diff --git a/mod/embed/views/default/embed/link.php b/mod/embed/views/default/embed/link.php index bbe6c74f5..c4fae0d42 100644 --- a/mod/embed/views/default/embed/link.php +++ b/mod/embed/views/default/embed/link.php @@ -4,7 +4,7 @@ */ // yeah this is naughty. embed and ecml might want to merge. -if (is_plugin_enabled('ecml')) { +if (elgg_is_active_plugin('ecml')) { $active_section = 'active_section=web_services&'; } else { $active_section = ''; diff --git a/mod/notifications/start.php b/mod/notifications/start.php index a200a6513..09d0f0c48 100644 --- a/mod/notifications/start.php +++ b/mod/notifications/start.php @@ -74,7 +74,7 @@ function notifications_plugin_pagesetup() { ); elgg_register_menu_item('page', $params); - if (is_plugin_enabled('groups')) { + if (elgg_is_active_plugin('groups')) { $params = array( 'name' => '2_group_notify', 'title' => elgg_echo('notifications:subscriptions:changesettings:groups'), diff --git a/mod/sitepages/index.php b/mod/sitepages/index.php index 053f82996..56463a8d8 100644 --- a/mod/sitepages/index.php +++ b/mod/sitepages/index.php @@ -16,7 +16,7 @@ $content .= elgg_view_title(elgg_echo('content:latest')); elgg_set_context('search');
$offset = (int)get_input('offset', 0);
-if(is_plugin_enabled('riverdashboard')){
+if(elgg_is_active_plugin('riverdashboard')){
$items = elgg_view_river_items(0, 0, "", "", "", '', 10, 0, 0, true, false);
$content .= elgg_view('riverdashboard/container', array('body' => $items . elgg_view('riverdashboard/js')));
}else{
diff --git a/mod/thewire/start.php b/mod/thewire/start.php index fea2cf460..2ae5c53e8 100644 --- a/mod/thewire/start.php +++ b/mod/thewire/start.php @@ -221,7 +221,7 @@ function rest_wire_post($username, $text) { if (($object) && ($object->subtype == get_subtype_id('object', 'sms'))) { // Get user from phone number - if ((is_plugin_enabled('smsclient')) && (is_plugin_enabled('smslogin'))) + if ((elgg_is_active_plugin('smsclient')) && (elgg_is_active_plugin('smslogin'))) { // By this stage the owner should be logged in (requires SMS Login) if (thewire_save_post($object->description, get_default_access(), 0, 'sms')) diff --git a/mod/twitterservice/start.php b/mod/twitterservice/start.php index 9f37aa151..ba7904ead 100644 --- a/mod/twitterservice/start.php +++ b/mod/twitterservice/start.php @@ -14,7 +14,7 @@ function twitterservice_init() { $notice_id = 'twitter_services_disable'; - if (!is_plugin_enabled('oauth_lib')) { + if (!elgg_is_active_plugin('oauth_lib')) { // disable the plugin disable_plugin('twitterservice'); diff --git a/views/default/core/settings/tools.php b/views/default/core/settings/tools.php index 8f5ee4af6..42b2227ff 100644 --- a/views/default/core/settings/tools.php +++ b/views/default/core/settings/tools.php @@ -19,7 +19,7 @@ $count = count($installed_plugins); // Display list of plugins $n = 0; foreach ($installed_plugins as $plugin => $data) { - if (is_plugin_enabled($plugin)) { + if (elgg_is_active_plugin($plugin)) { echo elgg_view("core/settings/tools/plugin", array('plugin' => $plugin, 'details' => $data)); } }
\ No newline at end of file |