summaryrefslogtreecommitdiff
path: root/program/include/rcmail.php
diff options
context:
space:
mode:
authorDavid Carter <dpc22@cam.ac.uk>2014-06-06 11:29:40 +0100
committerAleksander Machniak <alec@alec.pl>2014-11-16 14:41:28 +0100
commit94d8fb5a42899377804e42a3084845d034563167 (patch)
tree4f35494ebc4ab9417c1f2b83fa2a30bee96ed170 /program/include/rcmail.php
parent7e34e4c5b5dac037435d0fc2c6db1f71199006e0 (diff)
The following:
program/steps/mail/compose.inc :: rcmail_store_target_selection() program/steps/settings/edit_folder.inc :: rcmail_folder_form() both try to localise mailbox names. Push the logic down into the folder_selector() method which can use: $this->config->get('show_real_foldernames') to decide the correct default behaviour. Clients functions and methods can still override by adding 'realnames' named parameter to the folder_selector() call. The obvious example is the Settings -> Preferences -> Special Folders screen.
Diffstat (limited to 'program/include/rcmail.php')
-rw-r--r--program/include/rcmail.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 2f595deef..350b54fb9 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1342,7 +1342,8 @@ class rcmail extends rcube
*/
public function folder_selector($p = array())
{
- $p += array('maxlength' => 100, 'realnames' => false, 'is_escaped' => true);
+ $realnames = $this->config->get('show_real_foldernames');
+ $p += array('maxlength' => 100, 'realnames' => $realnames, 'is_escaped' => true);
$a_mailboxes = array();
$storage = $this->get_storage();