summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-04-13 17:57:37 +0200
committerAleksander Machniak <alec@alec.pl>2014-04-13 17:57:37 +0200
commit24e63e22188678407b180944f4c7bb9f494f09ee (patch)
tree32c4afc7abce7f2db1e3870fa89ab688b0560b93
parenta5949991351c70eb462f779368ceb0efbeea14fb (diff)
Fix deleting/moving folders from folders with name "0", "00", etc.
-rw-r--r--program/include/rcmail.php2
-rw-r--r--program/steps/mail/copy.inc2
-rw-r--r--program/steps/mail/move_del.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 7b663ca25..1fd077665 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2050,7 +2050,7 @@ class rcmail extends rcube
// create a per-folder UIDs array
foreach ((array)$_uid as $uid) {
list($uid, $mbox) = explode('-', $uid, 2);
- if (empty($mbox))
+ if (!strlen($mbox))
$mbox = $_mbox;
if ($uid == '*')
$result[$mbox] = $uid;
diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index 5668f7c4b..86586d34d 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -29,7 +29,7 @@ if (!empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
$target = rcube_utils::get_input_value('_target_mbox', rcube_utils::INPUT_POST, true);
foreach (rcmail::get_uids() as $mbox => $uids) {
- if ($mbox == $target)
+ if ($mbox === $target)
$copied++;
else
$copied += (int)$RCMAIL->storage->copy_message($uids, $target, $mbox);
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 9c1acd5d2..c29985875 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -37,7 +37,7 @@ if ($RCMAIL->action == 'move' && !empty($_POST['_uid']) && strlen($_POST['_targe
$success = true;
foreach (rcmail::get_uids() as $mbox => $uids) {
- if ($mbox == $target) {
+ if ($mbox === $target) {
$count += count($uids);
}
else if ($RCMAIL->storage->move_message($uids, $target, $mbox)) {