aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-03 12:10:45 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-03 12:10:45 +0000
commit4ff61fa6a8c012053659b1723b7dea9d38cd654e (patch)
tree4931ad21da79286d452c4e3ccbeb542875f9d53e /engine
parent755947e111d89d6babcd0f070d91c2245e22a809 (diff)
downloadelgg-4ff61fa6a8c012053659b1723b7dea9d38cd654e.tar.gz
elgg-4ff61fa6a8c012053659b1723b7dea9d38cd654e.tar.bz2
changed elgg_get_plugin_path() to elgg_get_plugins_path()
git-svn-id: http://code.elgg.org/elgg/trunk@8001 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/classes/ElggPlugin.php2
-rw-r--r--engine/classes/ElggPluginPackage.php2
-rw-r--r--engine/lib/configuration.php2
-rw-r--r--engine/lib/plugins.php6
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index b6cb792fb..5782ac4dd 100644
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -50,7 +50,7 @@ class ElggPlugin extends ElggObject {
parent::__construct($plugin);
$this->path = get_config('plugins_path') . $this->getID();
} else {
- $plugin_path = elgg_get_plugin_path();
+ $plugin_path = elgg_get_plugins_path();
// not a full path, so assume an id
// use the default path
diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php
index 74c8bd020..d7392132c 100644
--- a/engine/classes/ElggPluginPackage.php
+++ b/engine/classes/ElggPluginPackage.php
@@ -93,7 +93,7 @@ class ElggPluginPackage {
* @throws PluginException
*/
public function __construct($plugin, $validate = true) {
- $plugin_path = elgg_get_plugin_path();
+ $plugin_path = elgg_get_plugins_path();
// @todo wanted to avoid another is_dir() call here.
// should do some profiling to see how much it affects
if (strpos($plugin, $plugin_path) === 0 || is_dir($plugin)) {
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 3459c52a3..192959896 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -45,7 +45,7 @@ function elgg_get_site_url($site_guid = 0) {
* @return string
* @since 1.8.0
*/
-function elgg_get_plugin_path() {
+function elgg_get_plugins_path() {
global $CONFIG;
return $CONFIG->pluginspath;
}
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index c5a34bc81..783827d27 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -57,7 +57,7 @@ define('ELGG_PLUGIN_INTERNAL_PREFIX', 'elgg:internal:');
*/
function elgg_get_plugin_ids_in_dir($dir = null) {
if (!$dir) {
- $dir = elgg_get_plugin_path();
+ $dir = elgg_get_plugins_path();
}
$plugin_idss = array();
@@ -88,7 +88,7 @@ function elgg_get_plugin_ids_in_dir($dir = null) {
*/
function elgg_generate_plugin_entities() {
$site = get_config('site');
- $dir = elgg_get_plugin_path();
+ $dir = elgg_get_plugins_path();
$options = array(
'type' => 'object',
@@ -254,7 +254,7 @@ function elgg_get_max_plugin_priority() {
function elgg_load_plugins() {
global $CONFIG;
- $plugins_path = elgg_get_plugin_path();
+ $plugins_path = elgg_get_plugins_path();
$start_flags = ELGG_PLUGIN_INCLUDE_START
| ELGG_PLUGIN_REGISTER_VIEWS
| ELGG_PLUGIN_REGISTER_LANGUAGES