From d1749659d25c5b68600aef3557284cedff8dded1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 31 Jul 2014 08:16:05 -0400
Subject: [PATCH] Backported option to set default message list mode - default_list_mode (#1487312)
---
program/steps/mail/func.inc | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 10e0af6..5cf5dfd 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -142,6 +142,7 @@
{
global $RCMAIL;
+ $default_threading = $RCMAIL->config->get('default_list_mode', 'list') == 'threads';
$a_threading = $RCMAIL->config->get('message_threading', array());
$message_sort_col = $RCMAIL->config->get('message_sort_col');
$message_sort_order = $RCMAIL->config->get('message_sort_order');
@@ -181,13 +182,15 @@
$RCMAIL->storage->set_page($_SESSION['page'] = 1);
}
- unset($a_threading[$_SESSION['mbox']]);
+ $a_threading[$_SESSION['mbox']] = false;
}
$RCMAIL->user->save_prefs(array('message_threading' => $a_threading));
}
- $RCMAIL->storage->set_threading($a_threading[$_SESSION['mbox']]);
+ $threading = isset($a_threading[$_SESSION['mbox']]) ? $a_threading[$_SESSION['mbox']] : $default_threading;
+
+ $RCMAIL->storage->set_threading($threading);
}
/**
--
Gitblit v1.9.1