summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorcmcnulty <cmcnulty@kznf.com>2013-11-09 20:55:56 -0600
committercmcnulty <cmcnulty@kznf.com>2013-11-09 20:55:56 -0600
commitc503ee45ed3a50dc45073df985d80d2bb9653c6e (patch)
tree4ce913a24994a67a4b51b5feae4fa24b4279568b /program
parent1f705968827f9dea3ee66e5ea9d35f00d360ad9a (diff)
remerge with master
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/func.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9358848bd..78a977b82 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -255,7 +255,6 @@ function rcmail_message_list($attrib)
// save some variables for use in ajax list
$_SESSION['list_attrib'] = $attrib;
-
// make sure 'threads' and 'subject' columns are present
if (!in_array('subject', $a_show_cols))
array_unshift($a_show_cols, 'subject');