From 033b7726df3db6a96f2ade8e782709a6602ac3bc Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 8 Feb 2011 20:48:34 +0000
Subject: Fixes #2858: is_plugin_enabled() is deprecated by
 elgg_is_active_plugin() instead of ElggPlugin::isActive().

git-svn-id: http://code.elgg.org/elgg/trunk@8081 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggPlugin.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'engine/classes/ElggPlugin.php')

diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index ec28c8064..1e737f28e 100644
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -499,12 +499,13 @@ class ElggPlugin extends ElggObject {
 
 		if ($site_guid) {
 			$site = get_entity($site_guid);
-
-			if (!($site instanceof ElggSite)) {
-				return false;
-			}
 		} else {
-			$site = get_config('site');
+			$site_guid = get_config('site');
+			$site = get_entity($site_guid);
+		}
+
+		if (!($site instanceof ElggSite)) {
+			return false;
 		}
 
 		return check_entity_relationship($this->guid, 'active_plugin', $site->guid);
-- 
cgit v1.2.3