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 --- program/include/bc.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/program/include/bc.php b/program/include/bc.php index 05d15b9..af2e512 100644 --- a/program/include/bc.php +++ b/program/include/bc.php @@ -287,7 +287,7 @@ function rcube_check_referer() { - return rcmail::check_referer(); + return rcube_utils::check_referer(); } function rcube_timer() @@ -412,3 +412,7 @@ class washtml extends rcube_washtml { } + +class html2text extends rcube_html2text +{ +} -- Gitblit v1.9.1