[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tep-commits
Subject:    [TEP-COMMIT] CVS: catalog/catalog/includes/classes email.php,1.10,1.11
From:       Harald Ponce de Leon <hpdl () users ! sourceforge ! net>
Date:       2003-05-29 12:14:48
[Download RAW message or body]

Update of /cvsroot/tep/catalog/catalog/includes/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv882/catalog/includes/classes

Modified Files:
	email.php 
Log Message:
fix linefeed issues with emails


Index: email.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/includes/classes/email.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- email.php	28 May 2003 18:00:33 -0000	1.10
+++ email.php	29 May 2003 12:14:45 -0000	1.11
@@ -146,7 +146,7 @@
  */
 
     function add_text($text = '') {
-      $this->text = $text;
+      $this->text = tep_convert_linefeeds(array("\r\n", "\n", "\r"), $this->lf, $text);
     }
 
 /**
@@ -156,8 +156,8 @@
  */
 
     function add_html($html, $text = NULL, $images_dir = NULL) {
-      $this->html = nl2br($html);
-      $this->html_text = $text;
+      $this->html = tep_convert_linefeeds(array("\r\n", "\n", "\r"), '<br>', $html);
+      $this->html_text = tep_convert_linefeeds(array("\r\n", "\n", "\r"), $this->lf, $text);
 
       if (isset($images_dir)) $this->find_html_images($images_dir);
     }



-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Tep-commits mailing list
Tep-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tep-commits
[prev in list] [next in list] [prev in thread] [next in thread]