- Patch #443286 by c960657, Damien Tournoud, drifter, webkenny, scor: international characters break file handling.

2 files changed, 6 insertions, 6 deletions

diff --git a/includes/filetransfer/ftp.inc b/includes/filetransfer/ftp.inc
index b6046b2de..d370e09db 100644
--- a/includes/filetransfer/ftp.inc
+++ b/includes/filetransfer/ftp.inc
@@ -77,7 +77,7 @@ class FileTransferFTPWrapper extends FileTransferFTP {
         }
       }
       closedir($dh);
-      if (!rmdir($this->connection . $directory)) {
+      if (!drupal_rmdir($this->connection . $directory)) {
         $exception = new FileTransferException('Cannot remove @directory.', NULL, array('@directory' => $directory));
         throw $exception;
       }
@@ -91,7 +91,7 @@ class FileTransferFTPWrapper extends FileTransferFTP {
   }
 
   function removeFileJailed($destination) {
-    if (!@unlink($this->connection . '/' .$destination)) {
+    if (!@drupal_unlink($this->connection . '/' .$destination)) {
       throw new FileTransferException('Cannot remove @destination', NULL, array('@destination' => $destination));
     }
   }
diff --git a/includes/filetransfer/local.inc b/includes/filetransfer/local.inc
index 14e246671..8cad200b1 100644
--- a/includes/filetransfer/local.inc
+++ b/includes/filetransfer/local.inc
@@ -33,23 +33,23 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa
     }
     foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $filename => $file) {
       if ($file->isDir()) {
-        if (@!rmdir($filename)) {
+        if (@!drupal_rmdir($filename)) {
           throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $filename));
         }
       }
       elseif ($file->isFile()) {
-        if (@!unlink($filename)) {
+        if (@!drupal_unlink($filename)) {
           throw new FileTransferException('Cannot remove file %file.', NULL, array('%file' => $filename));
         }
       }
     }
-    if (@!rmdir($directory)) {
+    if (@!drupal_rmdir($directory)) {
       throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $directory));
     }
   }
 
   protected function removeFileJailed($file) {
-    if (@!unlink($file)) {
+    if (@!drupal_unlink($file)) {
       throw new FileTransferException('Cannot remove file %file.', NULL, array('%file' => $file));
     }
   }