diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-26 23:43:30 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-26 23:43:30 +0000 |
| commit | 03d72f274011422865fab69b4a6210c77a97eabe (patch) | |
| tree | 3aee11b477080af99f75972cecd2e005dd42083f | |
| parent | b5a87393452a7dc77cbaa52e3209bc25e0c22e79 (diff) | |
| download | elgg-03d72f274011422865fab69b4a6210c77a97eabe.tar.gz elgg-03d72f274011422865fab69b4a6210c77a97eabe.tar.bz2 | |
Fixes #3250 elgg_get_root_path() to be consistent
git-svn-id: http://code.elgg.org/elgg/trunk@8863 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/admin.php | 4 | ||||
| -rw-r--r-- | engine/lib/configuration.php | 4 | ||||
| -rw-r--r-- | mod/diagnostics/start.php | 2 | ||||
| -rw-r--r-- | mod/profile/start.php | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php index 06283d75e..a9a0382cc 100644 --- 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 4679a70d8..cbc083bd0 100644 --- 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 d310684ba..c55b10483 100644 --- 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 2106ee0ac..cc4c74fb2 100644 --- 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; } |