diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-30 22:33:04 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-30 22:33:04 +0000 |
commit | 540ce2b461ee6cef5ff0c7b6dd9d768b1338c229 (patch) | |
tree | 27b196e6e094119b01a015685162f5af1b034368 | |
parent | f6cd923ed7099e50bcbb0006d38c3b4a39215cb7 (diff) | |
download | brdo-540ce2b461ee6cef5ff0c7b6dd9d768b1338c229.tar.gz brdo-540ce2b461ee6cef5ff0c7b6dd9d768b1338c229.tar.bz2 |
#1006302 by aspilicious, bfroehle: Fixed can't install projects packed as zip in Update Manager.
-rw-r--r-- | includes/stream_wrappers.inc | 9 | ||||
-rw-r--r-- | modules/system/system.archiver.inc | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/includes/stream_wrappers.inc b/includes/stream_wrappers.inc index 23faf4fc9..1f837783d 100644 --- a/includes/stream_wrappers.inc +++ b/includes/stream_wrappers.inc @@ -671,11 +671,14 @@ abstract class DrupalLocalStreamWrapper implements DrupalStreamWrapperInterface */ public function url_stat($uri, $flags) { $this->uri = $uri; - if ($flags & STREAM_URL_STAT_QUIET) { - return @stat($this->getLocalPath()); + $path = $this->getLocalPath(); + // Suppress warnings if requested or if the file or directory does not + // exist. This is consistent with PHP's plain filesystem stream wrapper. + if ($flags & STREAM_URL_STAT_QUIET || !file_exists($path)) { + return @stat($path); } else { - return stat($this->getLocalPath()); + return stat($path); } } diff --git a/modules/system/system.archiver.inc b/modules/system/system.archiver.inc index cd9c9f48c..5a0972840 100644 --- a/modules/system/system.archiver.inc +++ b/modules/system/system.archiver.inc @@ -106,7 +106,12 @@ class ArchiverZip implements ArchiverInterface { } public function extract($path, Array $files = array()) { - $this->zip->extractTo($path, $files); + if ($files) { + $this->zip->extractTo($path, $files); + } + else { + $this->zip->extractTo($path); + } return $this; } |