summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/helpers/path_helper.php16
1 files changed, 5 insertions, 11 deletions
diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php
index 2eb85fefa..1b9bdae75 100644
--- a/system/helpers/path_helper.php
+++ b/system/helpers/path_helper.php
@@ -58,21 +58,15 @@ if ( ! function_exists('set_realpath'))
}
// Resolve the path
- if (function_exists('realpath') AND @realpath($path) !== FALSE)
- {
- $path = realpath($path);
- }
-
- // Add a trailing slash
- $path = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
+ $realpath = realpath($path);
- // Make sure the path exists
- if ($check_existance == TRUE && ! is_dir($path))
+ if ( ! $realpath)
{
- show_error('Not a valid path: '.$path);
+ return $check_existance ? show_error('Not a valid path: '.$path) : $path;
}
- return $path;
+ // Add a trailing slash, if this is a directory
+ return is_dir($realpath) ? rtrim($realpath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $realpath;
}
}