Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop

1 files changed, 9 insertions, 1 deletions

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index ef20e1978..c7d0bc52b 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -381,7 +381,15 @@ class CI_Email {
 	 */
 	public function message($body)
 	{
-		$this->_body = stripslashes(rtrim(str_replace("\r", "", $body)));
+		$this->_body = rtrim(str_replace("\r", "", $body));
+
+		//strip slashes only if magic quotes is ON
+		//if we do it with magic quotes OFF, it strips real, user-inputted chars.
+		if (get_magic_quotes_gpc())
+		{
+			$this->_body = stripslashes($this->_body);
+		}
+
 		return $this;
 	}