From d107d6d950b38b46fba58488c201d5cac35be156 Mon Sep 17 00:00:00 2001 From: vlakoff Date: Tue, 7 Feb 2017 11:01:55 +0100 Subject: Allow to omit trailing slash in config paths --- system/core/Exceptions.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'system/core/Exceptions.php') 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; -- cgit v1.2.3-24-g4f1b