From e48f8945b32ab5b67f1cdeb53a37d3d196e31e4d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 20 May 2016 05:19:01 -0400
Subject: [PATCH] Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting

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

diff --git a/tests/MailFunc.php b/tests/MailFunc.php
index 7fb78ef..b8aa1d2 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");
@@ -116,7 +116,7 @@
         $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