Fixes #3250 elgg_get_root_path() to be consistent

git-svn-id: http://code.elgg.org/elgg/trunk@8863 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 06283d75e080f41bdad6b5b1cb5c6d122fa4e394..a9a0382ccd42e665f703c0389f4654beb2c34197 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -459,11 +459,11 @@ function admin_plugin_screenshot_page_handler($pages) {
 
        $plugin = new ElggPlugin($plugin_id);
        if (!$plugin) {
-               $file = elgg_get_root_dir() . '_graphics/icons/default/medium.png';
+               $file = elgg_get_root_path() . '_graphics/icons/default/medium.png';
        } else {
                $file = $plugin->getPath() . $filename;
                if (!file_exists($file)) {
-                       $file = elgg_get_root_dir() . '_graphics/icons/default/medium.png';
+                       $file = elgg_get_root_path() . '_graphics/icons/default/medium.png';
                }
        }
 

diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 4679a70d8c7c2407ddff14c497483d040e802434..cbc083bd06df9a229a80863676707f6d3d23531d 100644 (file)
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -62,12 +62,12 @@ function elgg_get_data_path() {
 }
 
 /**
- * Get the root directory for this installation
+ * Get the root directory path for this installation
  *
  * @return string
  * @since 1.8.0
  */
-function elgg_get_root_dir() {
+function elgg_get_root_path() {
        global $CONFIG;
        return $CONFIG->path;
 }

diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index d310684ba0e5a8cba88aadcb9eb4b1d8cfbc8906..c55b1048308fe824b24254cf4267d9f49a510425 100644 (file)
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -86,7 +86,7 @@ function diagnostics_md5_dir($dir) {
  */
 function diagnostics_sigs_hook($hook, $entity_type, $returnvalue, $params) {
 
-       $base_dir = elgg_get_root_dir();
+       $base_dir = elgg_get_root_path();
        $returnvalue .= elgg_echo('diagnostics:report:md5', array(diagnostics_md5_dir($base_dir)));
 
        return $returnvalue;

diff --git a/mod/profile/start.php b/mod/profile/start.php
index 2106ee0ac4bcfaa36ca2f7aea1c3f5dda6619e3f..cc4c74fb21344457ed2de850f90d1bb6b9dc1fda 100644 (file)
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -66,7 +66,7 @@ function profile_page_handler($page) {
 
        if ($action == 'edit') {
                // use the core profile edit page
-               $base_dir = elgg_get_root_dir();
+               $base_dir = elgg_get_root_path();
                require "{$base_dir}pages/profile/edit.php";
                return;
        }