Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-11-07 2ad0a8d3f661046daa80d593c56a6a728a50a7f2

Merge branch 'master' of github.com:roundcube/roundcubemail

 plugins/help/skins/classic/templates/help.html

@@ -4,7 +4,6 @@
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/this/help.css" />
<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript">
function help_init_settings_tabs()
{

 program/steps/mail/func.inc

@@ -1247,7 +1247,7 @@

  if ($part->filename
    && preg_match('/^application\/octet-stream$/i', $part->mimetype)
    && preg_match('/\.([^.])$/i', $part->filename, $m)
    && preg_match('/\.([^.]+)$/i', $part->filename, $m)
    && ($extension = strtolower($m[1]))
    && isset($types[$extension])
  ) {