Merge pull request #2172 from tobiasd/20151212-frosticons

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index 0ac9f48ffa293ce2f7382c37625c7e0877ece044..e02c61383136f5350b01af64928883c5715e924c 100644 (file)
--- 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;