summaryrefslogtreecommitdiffstats
path: root/system/core/Output.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-02-07 15:00:12 +0100
committerGitHub <noreply@github.com>2017-02-07 15:00:12 +0100
commit2baad47c3051911b95960fd3d356edb581e36124 (patch)
tree41e10b6050763d280e0b3edb9b1c312ec96e1d9d /system/core/Output.php
parent8128e61ae620804fec1ed64b377abf95f1bab297 (diff)
parentd107d6d950b38b46fba58488c201d5cac35be156 (diff)
Merge pull request #5010 from vlakoff/paths
Allow to omit trailing slash in config paths
Diffstat (limited to 'system/core/Output.php')
-rw-r--r--system/core/Output.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 0887717d9..2cdb9808c 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -554,7 +554,7 @@ class CI_Output {
{
$CI =& get_instance();
$path = $CI->config->item('cache_path');
- $cache_path = ($path === '') ? APPPATH.'cache/' : $path;
+ $cache_path = ($path === '') ? APPPATH.'cache'.DIRECTORY_SEPARATOR : rtrim($path, '/\\').DIRECTORY_SEPARATOR;
if ( ! is_dir($cache_path) OR ! is_really_writable($cache_path))
{