Refs #2874: Using elgg_is_active_plugin() in core and bundled plugins.

git-svn-id: http://code.elgg.org/elgg/trunk@8082 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/input.php b/engine/lib/input.php
index 624c6111eb4553911bf2115a788d5eb5c82ee251..db43f9a2413cd11a669579d5095ba1ee4197adc8 100644 (file)
--- 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 4a02a77c68d581b3b8de47d51fafd3bc4d3b9529..554e10d8aa0014ce52ebb2e034be5419349c3305 100644 (file)
--- 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 1f95871969aba99ba3bb30ccfe3dfae003c806f7..74d1be820a193abd524f2b498de434249dd96b42 100644 (file)
--- 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 7e84a9d72ba0cfb9868cdd376037aa47144157f3..e839450da3c17d38bbb0d4c8eab6766b19925429 100644 (file)
--- 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 bbe6c74f570f7656385b70324c670372eb3c1328..c4fae0d42a60460a1dd817e5df0900cf3800e818 100644 (file)
--- 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 a200a6513b725fe67630ea449e1beeb23935f190..09d0f0c4872bcf8446eb3937fd2bdc2ddb05a494 100644 (file)
--- 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 053f8299681a4eacf38eaa169cac5742efbf0da6..56463a8d8e374eb95bd38ed8fc5c53c395c9dab1 100644 (file)
--- a/mod/sitepages/index.php
+++ b/mod/sitepages/index.php
@@ -16,7 +16,7 @@ $content .= elgg_view_title(elgg_echo('content:latest'));
 \r
 elgg_set_context('search');\r
 $offset = (int)get_input('offset', 0);\r
-if(is_plugin_enabled('riverdashboard')){\r
+if(elgg_is_active_plugin('riverdashboard')){\r
        $items = elgg_view_river_items(0, 0, "", "", "", '', 10, 0, 0, true, false);\r
        $content .= elgg_view('riverdashboard/container', array('body' => $items . elgg_view('riverdashboard/js')));\r
 }else{\r

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index fea2cf4609b61407ffa0961b9343b446e4e8ca8b..2ae5c53e8263c81149e26ee09d0594bc22baf7fb 100644 (file)
--- 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 9f37aa1514e300c5bbcd01ff6302199d3ee63e6b..ba7904eadd4990e12a64fd5d3858a03f2d037d1c 100644 (file)
--- 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 8f5ee4af6b52624da4c281dcc5ee7ec03e04dd13..42b2227ffd24a89a43bcf70e19dd5e90043acfd8 100644 (file)
--- 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