From 709ccc08f5f3a9fa6e1a233d57a1d4e267d2e8cb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 06 Jun 2014 06:54:04 -0400
Subject: [PATCH] Merge pull request #195 from dpc22/folder_realnames
---
program/steps/settings/edit_folder.inc | 1 -
program/include/rcmail.php | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 1a22792..f468921 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1325,7 +1325,8 @@
*/
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();
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index c61ac6d..30a187f 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -135,7 +135,6 @@
'id' => '_parent',
'name' => '_parent',
'noselection' => '---',
- 'realnames' => false,
'maxlength' => 150,
'unsubscribed' => true,
'skip_noinferiors' => true,
--
Gitblit v1.9.1