From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 tests/Framework/Html.php |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/Framework/Html.php b/tests/Framework/Html.php
index 8a27bac..60284de 100644
--- a/tests/Framework/Html.php
+++ b/tests/Framework/Html.php
@@ -31,7 +31,6 @@
             array('>', '&gt;'),
             array('&', '&amp;'),
             array('&amp;', '&amp;amp;'),
-            array('&amp;', '&amp;', true),
         );
     }
 
@@ -39,8 +38,8 @@
      * Test for quote()
      * @dataProvider data_quote
      */
-    function test_quote($str, $result, $validate = false)
+    function test_quote($str, $result)
     {
-        $this->assertEquals(html::quote($str, $validate), $result);
+        $this->assertEquals(html::quote($str), $result);
     }
 }

--
Gitblit v1.9.1