diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-01 00:13:47 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-01 00:13:47 +0000 |
commit | 66ffb5f7e8562a2f880be3b58dcf1e602cd95d4f (patch) | |
tree | 1ab39ea6455e04767db524ff098e2dd4d409593e /includes/filetransfer/local.inc | |
parent | 8fc5911c36c3671aaaa12dc02506873cec658e00 (diff) | |
download | brdo-66ffb5f7e8562a2f880be3b58dcf1e602cd95d4f.tar.gz brdo-66ffb5f7e8562a2f880be3b58dcf1e602cd95d4f.tar.bz2 |
#935036 by bfroehle, dww, int: Exclude '.' and '..' when recursing through directories in update module.
Diffstat (limited to 'includes/filetransfer/local.inc')
-rw-r--r-- | includes/filetransfer/local.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/filetransfer/local.inc b/includes/filetransfer/local.inc index 8cad200b1..d5744c191 100644 --- a/includes/filetransfer/local.inc +++ b/includes/filetransfer/local.inc @@ -31,7 +31,7 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa // Programmer error assertion, not something we expect users to see. throw new FileTransferException('removeDirectoryJailed() called with a path (%directory) that is not a directory.', NULL, array('%directory' => $directory)); } - foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $filename => $file) { + foreach (new RecursiveIteratorIterator(new SkipDotsRecursiveDirectoryIterator($directory), RecursiveIteratorIterator::CHILD_FIRST) as $filename => $file) { if ($file->isDir()) { if (@!drupal_rmdir($filename)) { throw new FileTransferException('Cannot remove directory %directory.', NULL, array('%directory' => $filename)); @@ -64,7 +64,7 @@ class FileTransferLocal extends FileTransfer implements FileTransferChmodInterfa public function chmodJailed($path, $mode, $recursive) { if ($recursive && is_dir($path)) { - foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) { + foreach (new RecursiveIteratorIterator(new SkipDotsRecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST) as $filename => $file) { if (@!chmod($filename, $mode)) { throw new FileTransferException('Cannot chmod %path.', NULL, array('%path' => $filename)); } |