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/core/Exceptions.php | |
| 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/core/Exceptions.php')
| -rw-r--r-- | system/core/Exceptions.php | 12 |
1 files changed, 12 insertions, 0 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; |