From dd9f475ff61e5808f4429cf5de0f5fda79224991 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 7 Oct 2015 06:22:15 +0200
Subject: [PATCH] personalise emails send from the server

---
 include/enotify.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/enotify.php b/include/enotify.php
index 0ac9f48ffa..e02c613831 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -20,7 +20,11 @@ function notification($params) {
 	$siteurl = $a->get_baseurl(true);
 	$thanks = t('Thank You,');
 	$sitename = $a->config['sitename'];
-	$site_admin = sprintf( t('%s Administrator'), $sitename);
+	if (!x($a->config['admin_name'])) {
+	    $site_admin = sprintf( t('%s Administrator'), $sitename);
+	} else {
+	    $site_admin = sprintf( t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
+	}
 	$nickname = "";
 
 	$sender_name = $sitename;