Portability for filepath in File

diff --git a/classes/File.php b/classes/File.php
index d6dd78cbef0afde8437245af1b11e88d0d0eb2a8..20e1bc8344156f9c73372e72f876f89222be353a 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -347,8 +347,8 @@ class File extends Managed_DataObject
         }
         $dir = common_config('attachments', 'dir');
 
-        if ($dir[strlen($dir)-1] != '/') {
-            $dir .= '/';
+        if (!in_array($dir[mb_strlen($dir)-1], ['/', '\\'])) {
+            $dir .= DIRECTORY_SEPARATOR;
         }
 
         return $dir . $filename;