diff options
| author | Adrian Lang <mail@adrianlang.de> | 2009-03-11 10:07:41 +0100 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2009-03-11 10:07:41 +0100 |
| commit | 72338b8c2674b8b6de8ba2d1eafeac4f27d5af92 (patch) | |
| tree | 6562a1e393c2ea9b3f4fdf901a7509b34eef863b /lib/mail.php | |
| parent | 622cc150d86265cbb1dcd35ae11f4941d42ffdeb (diff) | |
| parent | c6cd87c106b763ed5610dae64e5a02ba86609ece (diff) | |
Merge branch '0.7.x' of http://git.gitorious.org/laconica/erichelgeson-clone into review/0.7.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); |