Fix for CRM-19371

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index 485280bd74388dff1f7e43e6945ee069cb96606b..268373bad18dbbc16ed874f9c851ad1868cd3352 100644 (file)
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -604,6 +604,9 @@ HTACCESS;
     // make everything absolute from the baseFilePath
     $basePath = ($basePath === NULL) ? self::baseFilePath() : $basePath;
 
+    // ensure that $basePath has a trailing slash
+    $basePath = (substr($basePath, -strlen(DIRECTORY_SEPARATOR)) != DIRECTORY_SEPARATOR) ? $basePath . DIRECTORY_SEPARATOR : $basePath;
+
     return $basePath . $directory;
   }