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
---
plugins/zipdownload/zipdownload.php | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index 535248d..443fef7 100644
--- a/plugins/zipdownload/zipdownload.php
+++ b/plugins/zipdownload/zipdownload.php
@@ -258,11 +258,7 @@
/**
* Helper function to convert filenames to the configured charset
*/
-<<<<<<< HEAD
- private function _convert_filename($str, $from = RCMAIL_CHARSET)
-=======
private function _convert_filename($str)
->>>>>>> 4922472... Fix zipdownload plugin issue with filenames charset (#1489156)
{
$str = rcube_charset::convert($str, RCUBE_CHARSET, $this->charset);
--
Gitblit v1.9.1