diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-02-07 15:00:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 15:00:12 +0100 |
| commit | 2baad47c3051911b95960fd3d356edb581e36124 (patch) | |
| tree | 41e10b6050763d280e0b3edb9b1c312ec96e1d9d /system | |
| parent | 8128e61ae620804fec1ed64b377abf95f1bab297 (diff) | |
| parent | d107d6d950b38b46fba58488c201d5cac35be156 (diff) | |
Merge pull request #5010 from vlakoff/paths
Allow to omit trailing slash in config paths
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Exceptions.php | 12 | ||||
| -rw-r--r-- | system/core/Log.php | 4 | ||||
| -rw-r--r-- | system/core/Output.php | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 47d153f49..806598921 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -161,6 +161,10 @@ class CI_Exceptions { { $templates_path = VIEWPATH.'errors'.DIRECTORY_SEPARATOR; } + else + { + $templates_path = rtrim($templates_path, '/\\').DIRECTORY_SEPARATOR; + } if (is_cli()) { @@ -194,6 +198,10 @@ class CI_Exceptions { { $templates_path = VIEWPATH.'errors'.DIRECTORY_SEPARATOR; } + else + { + $templates_path = rtrim($templates_path, '/\\').DIRECTORY_SEPARATOR; + } $message = $exception->getMessage(); if (empty($message)) @@ -240,6 +248,10 @@ class CI_Exceptions { { $templates_path = VIEWPATH.'errors'.DIRECTORY_SEPARATOR; } + else + { + $templates_path = rtrim($templates_path, '/\\').DIRECTORY_SEPARATOR; + } $severity = isset($this->levels[$severity]) ? $this->levels[$severity] : $severity; diff --git a/system/core/Log.php b/system/core/Log.php index 5be7baea8..67b315b6b 100644 --- a/system/core/Log.php +++ b/system/core/Log.php @@ -124,7 +124,9 @@ class CI_Log { isset(self::$func_override) OR self::$func_override = (extension_loaded('mbstring') && ini_get('mbstring.func_override')); - $this->_log_path = ($config['log_path'] !== '') ? $config['log_path'] : APPPATH.'logs/'; + $this->_log_path = ($config['log_path'] !== '') + ? rtrim($config['log_path'], '/\\').DIRECTORY_SEPARATOR : APPPATH.'logs'.DIRECTORY_SEPARATOR; + $this->_file_ext = (isset($config['log_file_extension']) && $config['log_file_extension'] !== '') ? ltrim($config['log_file_extension'], '.') : 'php'; 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)) { |