Fix zipdownload plugin issue with filenames charset (#1489156)

Conflicts:

	CHANGELOG
	plugins/zipdownload/zipdownload.php

CHANGELOG

@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Fix "null" instead of empty string on messages list in IE10 (#1489145)
+- Fix zipdownload plugin issue with filenames charset (#1489156)
 - Fix so non-inline images aren't skipped on forward (#1489150)
 - Fix legacy options handling
 - Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)

plugins/zipdownload/zipdownload.php

@@ -105,7 +105,7 @@ class zipdownload extends rcube_plugin
 		foreach ($message->attachments as $part) {
 			$pid = $part->mime_id;
 			$part = $message->mime_parts[$pid];
-			$disp_name = $this->_convert_filename($part->filename, $part->charset);
+			$disp_name = $this->_convert_filename($part->filename);
 
 			if ($part->body) {
 				$orig_message_raw = $part->body;
@@ -258,9 +258,13 @@ class zipdownload extends rcube_plugin
 	/**
 	 * 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, $from == '' ? RCUBE_CHARSET : $from, $this->charset);
+        $str = rcube_charset::convert($str, RCUBE_CHARSET, $this->charset);
 
 		return strtr($str, array(':'=>'', '/'=>'-'));
 	}