From 54972caa65e2602a52406f0d9c344b9b019fdac2 Mon Sep 17 00:00:00 2001
From: Michael McAndrew <michaelmcandrew@thirdsectordesign.org>
Date: Tue, 27 Sep 2016 21:34:18 +0100
Subject: [PATCH] Use already existing addTrailingSlash function

---
 CRM/Utils/File.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
index 268373bad1..284b71a5ea 100644
--- a/CRM/Utils/File.php
+++ b/CRM/Utils/File.php
@@ -605,8 +605,7 @@ HTACCESS;
     $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;
-
+    $basePath = self::addTrailingSlash($basePath);
     return $basePath . $directory;
   }
 
-- 
2.25.1