Browse Source

Merge branch 'cake3' of git://github.com/dereuromark/cakephp-tools into cake3

Mark Scherer 10 years ago
parent
commit
87718a6e58
1 changed files with 2 additions and 3 deletions
  1. 2 3
      src/Network/Email/Email.php

+ 2 - 3
src/Network/Email/Email.php

@@ -112,10 +112,9 @@ class Email extends CakeEmail {
 			$fromEmail = Configure::read('Config.adminEmail');
 			$fromName = Configure::read('Config.adminName');
 		}
-		if (!$fromEmail) {
-			throw new \RuntimeException('You need to either define Config.systemEmail or Config.adminEmail in Configure.');
+		if ($fromEmail) {
+			$this->from($fromEmail, $fromName);
 		}
-		$this->from($fromEmail, $fromName);
 
 		if ($xMailer = Configure::read('Config.xMailer')) {
 			$this->addHeaders(['X-Mailer' => $xMailer]);