diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-12 11:56:23 -0400 |
| commit | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (patch) | |
| tree | 76666150701f03205bfff77e7d034dfa724f8764 /lib/mail.php | |
| parent | 399669b1fb955d2d8c18098a7b551184d534a94c (diff) | |
| parent | e185c0395a6cd250ccd7c8e385c54830be73f937 (diff) | |
Merge branch '0.7.x' into 0.8.x
Conflicts:
classes/Notice.php
lib/action.php
lib/router.php
lib/twitter.php
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); |