From b3fdb8014a8f1028502534e229bceea2e4f6686d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 26 May 2015 21:51:34 +0200 Subject: [PATCH] Better use isReadableFile() instead of plain is_readable() is the later will thrown an E_WARNING if the path is not within open_basedir. isReadableFile() uses isReachableFilePath() which does this check. Signed-off-by: Roland Haeder --- application/hub/main/template/class_BaseXmlTemplateEngine.php | 2 +- core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/hub/main/template/class_BaseXmlTemplateEngine.php b/application/hub/main/template/class_BaseXmlTemplateEngine.php index db4e2cfa2..676e09b00 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 (!is_readable($templateBasePath)) { + } elseif (!BaseFrameworkSystem::isReadableFile($templateBasePath)) { // Is not readable throw new BasePathReadProtectedException(array($this, $templateBasePath), self::EXCEPTION_READ_PROTECED_PATH); } diff --git a/core b/core index cdc1f3a9b..92c578b94 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit cdc1f3a9b3eefa6ca1b719c069e14c5ee2f9876a +Subproject commit 92c578b946b4fb17e705dd8ebabbd23e967584d0 -- 2.39.5