summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authordiegorivera <diego6616@yahoo.com.ar>2011-10-19 06:56:15 +0200
committerdiegorivera <diego6616@yahoo.com.ar>2011-10-19 06:56:15 +0200
commit33c3280d902bbe46096c3e2036ebbcce877219ae (patch)
tree8e69e256f2ad9a669e6819dc0bf019d8e1474e92 /system
parent825e9709a02840696dc1cbb6b2ca58590fc06bf1 (diff)
Update system/libraries/Email.php
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Email.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index ef20e1978..73ff2e7d1 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;
}