- Patch #23028 by chx: fixed file_check_location() problems.

1 files changed, 8 insertions, 1 deletions

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;