- if (!x($a->config['admin_name']))
- $sender_name = sprintf(t('%s Administrator'), $sitename);
- else
- $sender_name = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
-
- if (! x($a->config['sender_email']))
- $sender_email = 'noreply@' . $a->get_hostname();
- else
- $sender_email = $a->config['sender_email'];
+ if (empty(Config::get('config', 'admin_name'))) {
+ $sender_name = '"' . L10n::t('%s Administrator', $sitename) . '"';
+ } else {
+ $sender_name = '"' . L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename) . '"';
+ }
+
+ if (!Config::get('config', 'sender_email')) {
+ $sender_email = 'noreply@' . $a->getHostName();
+ } else {
+ $sender_email = Config::get('config', 'sender_email');
+ }