From 4721d9da0629eb2e9e82d73cf08f48b1eb818cb7 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 25 Apr 2014 09:29:01 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/web/client/client_edit.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index 1207c00..02f2c80 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -364,7 +364,7 @@
//* Get sender address
if($app->auth->is_admin()) {
$app->uses('getconf');
- $system_config = $app->getconf->get_global_config();
+ $system_config = $app->getconf->get_global_config('mail');
$from = $system_config['admin_mail'];
} else {
$client_group_id = $app->functions->intval($_SESSION["s"]["user"]["default_group"]);
--
Gitblit v1.9.1