commit 89b67b49616b19e9c9f0bee8f49cb1bfc93b7436
author Andrey Andreev <narf@bofh.bg> Tue Mar 12 19:34:23 2013 +0200
committer Andrey Andreev <narf@bofh.bg> Tue Mar 12 19:34:23 2013 +0200
tree 7622cbf9e22d21b09810d4ebb91cc7779d305a11
parent 00ffa302db71c50bd754bebe932e1cc3b65223a3

Fix #2320

system/libraries/Email.php

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 756a38a..a745d33 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -105,9 +105,9 @@
 	/**
 	 * SMTP Encryption
 	 *
-	 * @var	string	NULL, 'tls' or 'ssl'
+	 * @var	string	empty, 'tls' or 'ssl'
 	 */
-	public $smtp_crypto	= NULL;
+	public $smtp_crypto	= '';
 
 	/**
 	 * Whether to apply word-wrapping to the message body.
@@ -1875,7 +1875,7 @@
 			return TRUE;
 		}
 
-		$ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : NULL;
+		$ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : '';
 
 		$this->_smtp_connect = fsockopen($ssl.$this->smtp_host,
 							$this->smtp_port,