diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 20:48:34 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-08 20:48:34 +0000 |
| commit | 033b7726df3db6a96f2ade8e782709a6602ac3bc (patch) | |
| tree | 7cf68809593b0547a5a7badf788d1eaa2818cfc2 /engine/classes/ElggPlugin.php | |
| parent | cf13bfcc6ca27f5a73de1542e17cdba3e512b615 (diff) | |
| download | elgg-033b7726df3db6a96f2ade8e782709a6602ac3bc.tar.gz elgg-033b7726df3db6a96f2ade8e782709a6602ac3bc.tar.bz2 | |
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
Diffstat (limited to 'engine/classes/ElggPlugin.php')
| -rw-r--r-- | engine/classes/ElggPlugin.php | 11 |
1 files changed, 6 insertions, 5 deletions
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); |