diff options
author | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
---|---|---|
committer | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
commit | 420c3613049bec1360cdeb1f50283b239adf23d3 (patch) | |
tree | 0ab458b3c45c883232b3ed31addbc2aba1288f6a /lib/mail.php | |
parent | bab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (diff) | |
parent | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (diff) |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Diffstat (limited to 'lib/mail.php')
-rw-r--r-- | lib/mail.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/mail.php b/lib/mail.php index 9fa86de5c..dde7571eb 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -50,10 +50,9 @@ function mail_backend() static $backend = null; if (!$backend) { - global $config; - $backend = Mail::factory($config['mail']['backend'], - ($config['mail']['params']) ? - $config['mail']['params'] : + $backend = Mail::factory(common_config('mail', 'backend'), + (common_config('mail', 'params')) ? + common_config('mail', 'params') : array()); if (PEAR::isError($backend)) { common_server_error($backend->getMessage(), 500); |