From 921408eba600a7dc51271c35480e9114cac5ecec Mon Sep 17 00:00:00 2001
From: defa <defa@so36.net>
Date: Wed, 05 Sep 2012 08:48:55 -0400
Subject: [PATCH] Merge https://github.com/roundcube/roundcubemail into crypt_hash_branch
---
program/include/rcube_imap_generic.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/program/include/rcube_imap_generic.php b/program/include/rcube_imap_generic.php
index 915a11a..c3cfabc 100644
--- a/program/include/rcube_imap_generic.php
+++ b/program/include/rcube_imap_generic.php
@@ -2538,7 +2538,7 @@
{
unset($this->data['APPENDUID']);
- if (!$mailbox) {
+ if ($mailbox === null || $mailbox === '') {
return false;
}
@@ -2603,7 +2603,7 @@
{
unset($this->data['APPENDUID']);
- if (!$mailbox) {
+ if ($mailbox === null || $mailbox === '') {
return false;
}
@@ -2612,6 +2612,7 @@
if (file_exists(realpath($path))) {
$in_fp = fopen($path, 'r');
}
+
if (!$in_fp) {
$this->setError(self::ERROR_UNKNOWN, "Couldn't open $path for reading");
return false;
--
Gitblit v1.9.1