From fdd747fe351cff74ddac7eec9846f98e8d93cfc3 Mon Sep 17 00:00:00 2001
From: Hadi Nategh
Date: Tue, 25 Feb 2014 13:50:58 +0000
Subject: [PATCH] Unset drag_mail actions from display and preview toolbar, and
set view_rang for display toolbar to 6 actions
---
mail/inc/class.mail_ui.inc.php | 2 ++
mail/templates/default/display.xet | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index cb5114a554..e33be739df 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1846,6 +1846,7 @@ unset($query['actions']);
else $data["flags"][$flag] = $flag;
}
}
+ unset($actionsenabled['drag_mail']);
$data['attachmentsPresent'] = $imageTag;
$data['attachmentsBlock'] = $imageHTMLBlock;
$data['toolbaractions'] = json_encode($actionsenabled);
@@ -2005,6 +2006,7 @@ unset($query['actions']);
unset($actionsenabled['mark']['children']['read']);
unset($actionsenabled['mark']['children']['unread']);
unset($actionsenabled['mark']['children']['undelete']);
+ unset($actionsenabled['drag_mail']);
$actionsenabled['mark']['children']['flagged']=array(
'group' => $actionsenabled['mark']['children']['flagged']['group'],
'caption' => 'Flagged',
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index c75359abaf..8ac3d3e967 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -5,7 +5,7 @@
-
+