githubFork/roundcubemail.git

githubFork / roundcubemail

Roundcubemail devel

summary
reflog
commits
tree
docs
forks
compare

parent: b6100d9e | patch | commit | ignore whitespace

Remove merge conflict

Thomas Bruederli

2014-01-16 25a244908b21b097f744c7194e4862ca6ebda391

Remove merge conflict

1 files modified

program/steps/mail/move_del.inc

4 ●●●●● patch | view | raw | blame | history

 program/steps/mail/move_del.inc

@@ -32,11 +32,7 @@

// 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) {

			@@ -32,11 +32,7 @@

			// 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) {