Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

michaelcummings · Jan 9, 2015 · 34b33d9 · 34b33d9
2 parents 4309101 + bda4179
commit 34b33d9
Show file tree

Hide file tree

Showing 3 changed files with 542 additions and 250 deletions.
diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -2982,7 +2982,7 @@ public function msgHTML($message, $basedir = '', $advanced = false)
     public function html2text($html, $advanced = false)
     {
         if (is_callable($advanced)) {
-            return $advanced($html);
+            return call_user_func($advanced, $html);
         }
         return html_entity_decode(
             trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),