From 5f6dd42906472fbded5f9fd122379f15ad3307c0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 28 Apr 2014 04:45:47 -0400
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
interface/web/client/client_edit.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index d8dd3e9..54b8d1d 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -352,8 +352,8 @@
$subject = str_replace('{password}', $this->dataRecord['password'], $subject);
break;
case 'gender':
- $message = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $message);
- $subject = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $subject);
+ $message = str_replace('{salutation}', $app->tform->lng('gender_'.$val.'_txt'), $message);
+ $subject = str_replace('{salutation}', $app->tform->lng('gender_'.$val.'_txt'), $subject);
break;
default:
$message = str_replace('{'.$key.'}', $val, $message);
@@ -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