Internal overhaul

2013-11-28 17:41:34 +11:00
parent 0ed5e5163d
commit f8a5b153cf
91 changed files with 1570 additions and 1619 deletions
--- a/modules/email/classes/Email/Template.php
+++ b/modules/email/classes/Email/Template.php
@@ -134,8 +134,8 @@ class Email_Template {
 			}
 		}

-		if (isset($this->_data['bcc']))
-			$sm->setBcc($this->bcc);
+		if ($x=Arr::merge($this->bcc,Kohana::$config->load('debug.email_bcc_admin')))
+			$sm->setBcc($x);

 		if ($admin OR ($admin = Config::testmail($this->_etto->template->name))) {
 			$sm->setTo($admin);