From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 28 Oct 2009 18:45:00 +0000 (-0600)
Subject: Fix reading stream in combine wrapper
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bb225fdeda7eaaa606defa98cb3e8f11ecefb38f;p=horde.git

Fix reading stream in combine wrapper
---

diff --git a/framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/Combine.php b/framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/Combine.php
index d3670c3ec..a44545bcf 100644
--- a/framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/Combine.php
+++ b/framework/Stream_Wrapper/lib/Horde/Stream/Wrapper/Combine.php
@@ -135,10 +135,12 @@ class Horde_Stream_Wrapper_Combine
                 } else {
                     $tmp['p'] += $curr_read;
                 }
-            } else {
+            } elseif ($count) {
                 $tmp = &$this->_data[++$this->_datapos];
                 rewind($tmp['fp']);
                 $tmp['p'] = 0;
+            } else {
+                $tmp['p'] += $curr_read;
             }
         }