Do Html entities on subject...

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@164 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/message.inc.php b/banana/message.inc.php
index 17fcf5c..b3dbc8b 100644 (file)
--- a/banana/message.inc.php
+++ b/banana/message.inc.php
@@ -108,6 +108,7 @@ final class BananaMessage extends BananaMimePart
 
           case "subject":
             $text = stripslashes($text);
+            $text = html_entities($text);
             return banana_catchFormats($text);
 
           default:

diff --git a/banana/spool.inc.php b/banana/spool.inc.php
index 505c2c1..0f8b64c 100644 (file)
--- a/banana/spool.inc.php
+++ b/banana/spool.inc.php
@@ -430,7 +430,7 @@ class BananaSpool
             if (function_exists('hook_formatDisplayHeader')) {
                 list($subject, $link) = hook_formatDisplayHeader('subject', $subject, true);
             } else {
-                $subject = banana_catchFormats(stripslashes($subject));
+                $subject = banana_catchFormats(banana_htmlentities(stripslashes($subject)));
                 $link = null;
             }
             if (empty($subject)) {