diff options
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | includes/filetransfer/filetransfer.inc | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a8fd518dc..dead2710e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,8 @@ Drupal 7.22, xxxx-xx-xx (development version) ----------------------- +- Fixed a bug which prevented Drupal's file transfer functionality from working + on some PHP 5.4 systems. - Fixed incorrect log message when theme() is called for a theme hook that does not exist (minor string change). - Fixed Drupal's token-replacement system to allow spaces in the token value. diff --git a/includes/filetransfer/filetransfer.inc b/includes/filetransfer/filetransfer.inc index 023b866e3..6c55b2f43 100644 --- a/includes/filetransfer/filetransfer.inc +++ b/includes/filetransfer/filetransfer.inc @@ -406,10 +406,20 @@ class SkipDotsRecursiveDirectoryIterator extends RecursiveDirectoryIterator { */ function __construct($path) { parent::__construct($path); + $this->skipdots(); + } + + function rewind() { + parent::rewind(); + $this->skipdots(); } function next() { parent::next(); + $this->skipdots(); + } + + protected function skipdots() { while ($this->isDot()) { parent::next(); } |