projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dad694e
)
Correctly return a stream even if error is encountered.
author
Michael M Slusarz
<slusarz@curecanti.org>
Mon, 26 Oct 2009 18:32:16 +0000
(12:32 -0600)
committer
Michael M Slusarz
<slusarz@curecanti.org>
Mon, 26 Oct 2009 18:35:45 +0000
(12:35 -0600)
imp/lib/Contents.php
patch
|
blob
|
history
diff --git
a/imp/lib/Contents.php
b/imp/lib/Contents.php
index
693ef49
..
95d4eee
100644
(file)
--- a/
imp/lib/Contents.php
+++ b/
imp/lib/Contents.php
@@
-252,7
+252,9
@@
class IMP_Contents
return $swrapper->fopen();
}
} catch (Horde_Imap_Client_Exception $e) {
- return '';
+ return empty($options['stream'])
+ ? ''
+ : fopen('php://temp', 'r+');
}
}
@@
-289,7
+291,7
@@
class IMP_Contents
} catch (Horde_Imap_Client_Exception $e) {
return empty($options['stream'])
? ''
- :
array(
);
+ :
fopen('php://temp', 'r+'
);
}
}