From 2f0cc94a3d4c2464a3b4e6df8c092c63fbfaeb2d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 26 May 2015 23:54:42 +0200 Subject: [PATCH] Updated 'core' + more usage of FileNotFoundException + updated index.php Signed-off-by: Roland Haeder --- application/hub/main/template/class_BaseXmlTemplateEngine.php | 2 +- core | 2 +- index.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php index 676e09b00..db4e2cfa2 100644 --- a/application/hub/main/template/class_BaseXmlTemplateEngine.php +++ b/application/hub/main/template/class_BaseXmlTemplateEngine.php @@ -99,7 +99,7 @@ class BaseXmlTemplateEngine extends BaseTemplateEngine { } elseif (!is_dir($templateBasePath)) { // Is not a path throw new BasePathIsNoDirectoryException(array($this, $templateBasePath), self::EXCEPTION_INVALID_PATH_NAME); - } elseif (!BaseFrameworkSystem::isReadableFile($templateBasePath)) { + } elseif (!is_readable($templateBasePath)) { // Is not readable throw new BasePathReadProtectedException(array($this, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH); } diff --git a/core b/core index 45f745c84..0ae3d7b0f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 45f745c841b922173589746722ab8ab986d9f472 +Subproject commit 0ae3d7b0ff8ec700c174130c886eb2f9467022f0 diff --git a/index.php b/index.php index 51eb50ef9..0a3ef7411 100644 --- a/index.php +++ b/index.php @@ -150,7 +150,7 @@ final class ApplicationEntryPoint { // Flush the response $responseInstance->flushBuffer(); - } catch (FileIoException $e) { + } catch (FileNotFoundException $e) { // Even the template 'emergency_exit' wasn't found so output both message exit($message . ', exception: ' . $e->getMessage()); } -- 2.39.5