From b6100d9ed21f355b6b492d30aa3426a87be96298 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 16 Jan 2014 05:41:09 -0500
Subject: [PATCH] Merge branch 'dev-multi-folder-search' of github.com:roundcube/roundcubemail into dev-multi-folder-search after rebasing to master
---
program/steps/mail/move_del.inc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 26c7245..9a8b4a3 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -32,7 +32,11 @@
// move messages
if ($RCMAIL->action == 'move' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
+<<<<<<< HEAD
$target = rcube_utils::get_input_value('_target_mbox', rcube_utils::INPUT_POST, true);
+=======
+ $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
+>>>>>>> 010a350715f1a36eab666fe26d3118ed025133c1
$trash = $RCMAIL->config->get('trash_mbox');
foreach (rcmail_get_uids() as $mbox => $uids) {
--
Gitblit v1.9.1