diff options
author | webchick <webchick@24967.no-reply.drupal.org> | 2012-01-21 10:52:40 -0800 |
---|---|---|
committer | webchick <webchick@24967.no-reply.drupal.org> | 2012-01-21 10:52:40 -0800 |
commit | 8164434505e4292e5d584eebbf7b05b403d9c07b (patch) | |
tree | 723b2507f6382b71902eb4bb7aa2a6c37a1e3c95 /includes/filetransfer/filetransfer.inc | |
parent | 283523192421f0708c01f7fa08d5814442c757a5 (diff) | |
download | brdo-8164434505e4292e5d584eebbf7b05b403d9c07b.tar.gz brdo-8164434505e4292e5d584eebbf7b05b403d9c07b.tar.bz2 |
Issue #278425 by andypost, droplet, OnkelTem, chx, c960657, drewish, kotnik, realityloop: Change notice for: Using basename() is not locale safe.
Diffstat (limited to 'includes/filetransfer/filetransfer.inc')
-rw-r--r-- | includes/filetransfer/filetransfer.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/filetransfer/filetransfer.inc b/includes/filetransfer/filetransfer.inc index 2083da9d3..bd2057cdd 100644 --- a/includes/filetransfer/filetransfer.inc +++ b/includes/filetransfer/filetransfer.inc @@ -211,7 +211,7 @@ abstract class FileTransfer { */ protected function copyDirectoryJailed($source, $destination) { if ($this->isDirectory($destination)) { - $destination = $destination . '/' . basename($source); + $destination = $destination . '/' . drupal_basename($source); } $this->createDirectory($destination); foreach (new RecursiveIteratorIterator(new SkipDotsRecursiveDirectoryIterator($source), RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) { @@ -302,9 +302,9 @@ abstract class FileTransfer { $chroot = ''; while (count($parts)) { $check = implode($parts, '/'); - if ($this->isFile($check . '/' . basename(__FILE__))) { + if ($this->isFile($check . '/' . drupal_basename(__FILE__))) { // Remove the trailing slash. - return substr($chroot,0,-1); + return substr($chroot, 0, -1); } $chroot .= array_shift($parts) . '/'; } |