Changeset 6385


Ignore:
Timestamp:
May 27, 2010, 9:31:08 AM (10 years ago)
Author:
plg
Message:

merge r6384 from branch 2.1 to trunk

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

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/functions_upload.inc.php

    r6052 r6385  
    142142{
    143143  if (!is_dir($directory)) {
     144    if (substr(PHP_OS, 0, 3) == 'WIN')
     145    {
     146      $directory = str_replace('/', DIRECTORY_SEPARATOR, $directory);
     147    }
    144148    umask(0000);
    145149    $recursive = true;
  • trunk/include/functions.inc.php

    r6355 r6385  
    169169  if ( !is_dir($dir) )
    170170  {
     171    if (substr(PHP_OS, 0, 3) == 'WIN')
     172    {
     173      $dir = str_replace('/', DIRECTORY_SEPARATOR, $dir);
     174    }
    171175    $umask = umask(0);
    172176    $mkd = @mkdir($dir, 0755, ($flags&MKGETDIR_RECURSIVE) ? true:false );
Note: See TracChangeset for help on using the changeset viewer.