From 24e63e22188678407b180944f4c7bb9f494f09ee Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 13 Apr 2014 11:57:37 -0400
Subject: [PATCH] Fix deleting/moving folders from folders with name "0", "00", etc.
---
program/include/rcmail.php | 2 +-
program/steps/mail/copy.inc | 2 +-
program/steps/mail/move_del.inc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 7b663ca..1fd0776 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -2050,7 +2050,7 @@
// 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 5668f7c..86586d3 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -29,7 +29,7 @@
$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 9c1acd5..c299858 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -37,7 +37,7 @@
$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)) {
--
Gitblit v1.9.1