contactform - reset encoded quotes for text and subject

s9y · Dec 1, 2015 · c3a2344 · c3a2344
1 parent ed11b82
commit c3a2344
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/serendipity_event_contactform/ChangeLog b/serendipity_event_contactform/ChangeLog
@@ -1,3 +1,7 @@
+1.19:
+-----
+ * reset encoded quotes for text and subject
+
 1.18:
 -----
  * Use native API method parseTemplate() for the tpl files
@@ -41,4 +45,4 @@
 1.10:
 -----
 
-* Introdcuce new "issue counter".
+* Introduce new "issue counter".
diff --git a/serendipity_event_contactform/serendipity_event_contactform.php b/serendipity_event_contactform/serendipity_event_contactform.php
@@ -29,7 +29,7 @@ function introspect(&$propbag) {
         $propbag->add('event_hooks',  array('entries_header' => true, 'entry_display' => true, 'genpage' => true));
         $propbag->add('configuration', array('permalink', 'pagetitle', 'backend_title', 'email', 'subject', 'counter', 'intro', 'sent', 'articleformat', 'dynamic_tpl', 'dynamic_fields', 'dynamic_fields_tpl', 'dynamic_fields_desc'));
         $propbag->add('author', 'Garvin Hicking');
-        $propbag->add('version', '1.18');
+        $propbag->add('version', '1.19');
         $propbag->add('requirements',  array(
             'serendipity' => '1.3',
             'smarty'      => '2.6.7',
@@ -188,6 +188,10 @@ function sendComment($to, $fromName, $fromEmail, $fromUrl, $comment, $dynamic =
               . "\n"
               . "\n" . '----';
 
+        // reset encoded quotes for text and subject
+        $subject = str_replace('&quot;', '"', $subject);
+        $text    = str_replace('&quot;', '"', $text);
+
         return serendipity_sendMail($to, $subject, $text, $fromEmail, null, $fromName);
     }