From 033b7726df3db6a96f2ade8e782709a6602ac3bc Mon Sep 17 00:00:00 2001 From: brettp 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/lib/deprecated-1.8.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'engine/lib/deprecated-1.8.php') diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php index bf474abc2..67e150173 100644 --- a/engine/lib/deprecated-1.8.php +++ b/engine/lib/deprecated-1.8.php @@ -1718,23 +1718,8 @@ function disable_plugin($plugin, $site_guid = 0) { * @return bool */ function is_plugin_enabled($plugin, $site_guid = 0) { - elgg_deprecated_notice('is_plugin_enabled() was deprecated by ElggPlugin->isActive()', 1.8); - - $plugin = sanitise_string($plugin); - - $site_guid = (int) $site_guid; - if (!$site_guid) { - $site = get_config('site'); - $site_guid = $site->guid; - } - - try { - $plugin = new ElggPlugin($plugin); - } catch(Exception $e) { - return false; - } - - return $plugin->isActive($site_guid); + elgg_deprecated_notice('is_plugin_enabled() was deprecated by elgg_is_active_plugin()', 1.8); + return elgg_is_active_plugin($plugin, $site_guid); } /** -- cgit v1.2.3