bug 1704 fixed: windows needs a specific directory separator when creating

recursive directory.

git-svn-id: http://piwigo.org/svn/branches/2.1@6384 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 8 insertions, 0 deletions

diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php
index 2d8be3ceb..438f30bcd 100644
--- a/admin/include/functions_upload.inc.php
+++ b/admin/include/functions_upload.inc.php
@@ -141,6 +141,10 @@ function add_uploaded_file($source_filepath, $original_filename=null, $categorie
 function prepare_directory($directory)
 {
   if (!is_dir($directory)) {
+    if (substr(PHP_OS, 0, 3) == 'WIN')
+    {
+      $directory = str_replace('/', DIRECTORY_SEPARATOR, $directory);
+    }
     umask(0000);
     $recursive = true;
     if (!@mkdir($directory, 0777, $recursive))
diff --git a/include/functions.inc.php b/include/functions.inc.php
index ede0cf30a..0a93d3927 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -168,6 +168,10 @@ function mkgetdir($dir, $flags=MKGETDIR_DEFAULT)
 {
   if ( !is_dir($dir) )
   {
+    if (substr(PHP_OS, 0, 3) == 'WIN')
+    {
+      $dir = str_replace('/', DIRECTORY_SEPARATOR, $dir);
+    }
     $umask = umask(0);
     $mkd = @mkdir($dir, 0755, ($flags&MKGETDIR_RECURSIVE) ? true:false );
     umask($umask);