From 1f0ea636d91fac4b4c51f3a98e940390ff5ed6a5 Mon Sep 17 00:00:00 2001 From: cash Date: Tue, 30 Nov 2010 01:13:16 +0000 Subject: Refs #2428 adds elgg_get_plugin_path() and elgg_get_data_path() git-svn-id: http://code.elgg.org/elgg/trunk@7476 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/configuration.php | 44 ++++++++++++++++++++++++++++++++++++++++++++ engine/lib/elgglib.php | 21 --------------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index bf5122653..4b908de51 100644 --- a/engine/lib/configuration.php +++ b/engine/lib/configuration.php @@ -17,6 +17,50 @@ * @subpackage Configuration */ +/** + * Get the URL for the current (or specified) site + * + * @param int $site_guid The GUID of the site whose URL we want to grab + * @return string + * @since 1.8.0 + */ +function elgg_get_site_url($site_guid = 0) { + if ($site_guid == 0) { + global $CONFIG; + return $CONFIG->wwwroot; + } + + $site = get_entity($site_guid); + + if (!$site instanceof ElggSite) { + return false; + } + + return $site->url; +} + +/** + * Get the plugin path for this installation + * + * @return string + * @since 1.8.0 + */ +function elgg_get_plugin_path() { + global $CONFIG; + return $CONFIG->pluginspath; +} + +/** + * Get the data directory path for this installation + * + * @return string + * @since 1.8.0 + */ +function elgg_get_data_path() { + global $CONFIG; + return $CONFIG->dataroot; +} + /** * Get an Elgg configuration value * diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index ec67f97cf..7c787e513 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1457,27 +1457,6 @@ function callpath_gatekeeper($path, $include_subdirs = true, $strict_mode = fals return false; } -/** - * Get the URL for the current (or specified) site - * - * @param int $site_guid The GUID of the site whose URL we want to grab - * @return string - */ -function elgg_get_site_url($site_guid = 0) { - if ($site_guid == 0) { - global $CONFIG; - return $CONFIG->wwwroot; - } - - $site = get_entity($site_guid); - - if (!$site instanceof ElggSite) { - return false; - } - - return $site->url; -} - /** * Returns the current page's complete URL. * -- cgit v1.2.3