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

12 years ago · 2ad0a8d3f6
parent 19b0d444e7 9ce2398ef9
commit 2ad0a8d3f6
2 changed files with 2 additions and 3 deletions
--- a/plugins/help/skins/classic/templates/help.html
+++ b/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()
 {
@ -13,7 +12,7 @@ function help_init_settings_tabs()
 	    tab = '#helptab' + (action ? action : 'default');
    }
    $(tab).addClass('tablink-selected');
-}	       
+}
 </script>
 </head>
 <body>
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@ -1247,7 +1247,7 @@ function rcmail_part_image_type($part)

  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])
  ) {