aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-09 00:30:35 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-09 00:30:35 +0000
commitb97b391cdd12ec62931c2a825ed4c70478ec5db0 (patch)
tree68c6d83de079eb3b54dfbb543ff11b028d24ad4b /engine
parent033b7726df3db6a96f2ade8e782709a6602ac3bc (diff)
downloadelgg-b97b391cdd12ec62931c2a825ed4c70478ec5db0.tar.gz
elgg-b97b391cdd12ec62931c2a825ed4c70478ec5db0.tar.bz2
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
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/input.php2
-rw-r--r--engine/lib/upgrades/2010050701.php2
-rw-r--r--engine/lib/upgrades/2010100500.php2
3 files changed, 3 insertions, 3 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');
}