|
@@ -447,8 +447,8 @@ class EmailLib extends CakeEmail {
|
|
|
//$this->_headers['Importance'] = 'High';
|
|
//$this->_headers['Importance'] = 'High';
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // Security measure to not sent to the actual addressee in debug mode
|
|
|
|
|
- if (Configure::read('debug') && !Configure::read('Email.live')) {
|
|
|
|
|
|
|
+ // Security measure to not sent to the actual addressee in debug mode while email sending is live
|
|
|
|
|
+ if (Configure::read('debug') && Configure::read('Email.live')) {
|
|
|
$adminEmail = Configure::read('Config.adminEmail');
|
|
$adminEmail = Configure::read('Config.adminEmail');
|
|
|
if (!$adminEmail) {
|
|
if (!$adminEmail) {
|
|
|
$adminEmail = Configure::read('Config.systemEmail');
|
|
$adminEmail = Configure::read('Config.systemEmail');
|
|
@@ -517,6 +517,15 @@ class EmailLib extends CakeEmail {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
|
+ * Returns the log if existent
|
|
|
|
|
+ *
|
|
|
|
|
+ * @return string
|
|
|
|
|
+ */
|
|
|
|
|
+ public function getLog() {
|
|
|
|
|
+ return $this->_log;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
* Returns the debug content returned by send()
|
|
* Returns the debug content returned by send()
|
|
|
*
|
|
*
|
|
|
* @return string
|
|
* @return string
|