deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing the email plugin so that it retrieves the system config correctly.

Browse source
This commit is contained in:
meadsteve 2013-06-01 13:29:59 +01:00
commit 76e5c66b38
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
PHPCI/Plugin/Email.php
View file

@ -43,9 +43,10 @@ class Email implements \PHPCI\Plugin
array $options = array(),
\Swift_Mailer $mailer = null)
{
$phpCiSettings = $phpci->getSystemConfig('phpci');
$this->phpci = $phpci;
$this->options = $options;
$this->emailConfig = $phpci->getConfig('email_settings');
$this->emailConfig = isset($phpCiSettings['email_settings']) ? $phpCiSettings['email_settings'] : array();
// Either a mailer will have been passed in or we load from the
// config.
@ -99,12 +100,16 @@ class Email implements \PHPCI\Plugin
protected function getMailConfig($configName)
{
if (isset($this->emailConfig[$configName])) {
if (isset($this->emailConfig[$configName])
&& $this->emailConfig[$configName] != "")
{
return $this->emailConfig[$configName];
}
// Check defaults
else {
switch($configName) {
case 'smtp_address':
return "localhost";
case 'smtp_port':
return '25';
case 'from_address':