From fa2469c1dd3eb60f97a1824e0a37c65f83f3e332 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 17 May 2005 20:49:54 +0000
Subject: - Patch #23028 by chx: fixed file_check_location() problems.

---
 includes/file.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/file.inc b/includes/file.inc
index 9740836e7..c62334154 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -170,7 +170,14 @@ function file_check_upload($source) {
  * @return 0 for invalid path or the real path of the source.
  */
 function file_check_location($source, $directory = 0) {
-  $source = realpath($source);
+  $check = realpath($source);
+  if ($check) {
+    $source = $check;
+  }
+  else {
+    // This file does not yet exist
+    $source = realpath(dirname($source)) .'/'. basename($source);
+  }
   $directory = realpath($directory);
   if ($directory && strpos($source, $directory) !== 0) {
     return 0;
-- 
cgit v1.2.3