From 3d0d5dbd0f35c47b21e2e574703a08f07ce677dd Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 08 May 2016 08:27:56 -0400
Subject: [PATCH] Performance improvements in format_flowed() and unfold_flowed()

---
 tests/MailFunc.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/MailFunc.php b/tests/MailFunc.php
index 7fb78ef..f4fc3ed 100644
--- a/tests/MailFunc.php
+++ b/tests/MailFunc.php
@@ -45,7 +45,7 @@
         $html = rcmail_html4inline(rcmail_print_body($part->body, $part, array('safe' => false)), 'foo');
 
         $this->assertRegExp('/src="'.$part->replaces['ex1.jpg'].'"/', $html, "Replace reference to inline image");
-        $this->assertRegExp('#background="./program/resources/blocked.gif"#', $html, "Replace external background image");
+        $this->assertRegExp('#background="program/resources/blocked.gif"#', $html, "Replace external background image");
         $this->assertNotRegExp('/ex3.jpg/', $html, "No references to external images");
         $this->assertNotRegExp('/<meta [^>]+>/', $html, "No meta tags allowed");
         //$this->assertNoPattern('/<style [^>]+>/', $html, "No style tags allowed");
@@ -110,13 +110,15 @@
 
     /**
      * Test washtml class on non-unicode characters (#1487813)
+     * @group iconv
+     * @group mbstring
      */
     function test_washtml_utf8()
     {
         $part = $this->get_html_part('src/invalidchars.html');
         $washed = rcmail_print_body($part->body, $part);
 
-        $this->assertRegExp('/<p>символ<\/p>/', $washed, "Remove non-unicode characters from HTML message body");
+        $this->assertRegExp('/<p>(символ|симол)<\/p>/', $washed, "Remove non-unicode characters from HTML message body");
     }
 
     /**

--
Gitblit v1.9.1