From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 04 May 2016 07:27:53 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/mail/mail_user_edit.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index e1e05d3..a155cbd 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -209,7 +209,7 @@
 
 		// Set Maildir format
 		if ($this->id == 0) {
-			$this->dataRecord['maildir_format'] = $sys_config['maildir_format'];
+			$this->dataRecord['maildir_format'] = $mail_config['maildir_format'];
 		}
 		else {
 			// restore Maildir format

--
Gitblit v1.9.1