From d75b9bdf6414f2e064267907f07f27f1dcf682cf Mon Sep 17 00:00:00 2001 From: Dominique Fournier Date: Mon, 22 Aug 2016 19:02:02 +0000 Subject: [PATCH] file : file_exists do not raise an exception if a parent or the path is missing git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3002 bf3deb0d-5f1a-0410-827f-c0cc1f45334c --- file.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/file.php b/file.php index 199f477..ce8452a 100644 --- a/file.php +++ b/file.php @@ -68,7 +68,15 @@ class file { $this->debug (2, "file_exists ($filename)"); $filename = $this->realpath ($filename); - $this->checkPathRO (dirname ($filename)); + try + { + $this->checkPathRO (dirname ($filename)); + } + catch (\Exception $e) + { + if ($e->getCode () !== 404) + throw new \Exception ($e->getMessage (), $e->getCode ()); + } if (file_exists ($filename) && ! is_link ($filename)) return true; return false; @@ -518,7 +526,6 @@ class file if (! file_exists ($path)) { $this->debug (1, "checkPathRO ($path) => Path '$path' not found"); - return $this->checkExternalPathRO ($path); throw new \Exception (sprintf (dgettext ("domframework", "Path '%s' not found"), $path), 404);