summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2007-06-11 06:47:58 +0200
committerRick Ellis <rick.ellis@ellislab.com>2007-06-11 06:47:58 +0200
commit8d127c78fe0a1d6034cb503529dc548b566156c8 (patch)
treebac20fe7fe0623e5ce4f3d060617b22d030e195f
parent1adf1db17260090e2678f209ad429b0b186e3dbc (diff)
-rw-r--r--system/libraries/Email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index a8acec674..7b7dc091c 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -484,7 +484,7 @@ class CI_Email {
*/
function set_newline($newline = "\n")
{
- if ($newline != "\n" OR $newline != "\r\n" OR $newline != "\r")
+ if ($newline != "\n" AND $newline != "\r\n" AND $newline != "\r")
{
$this->newline = "\n";
return;