From 2ad0a8d3f661046daa80d593c56a6a728a50a7f2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 07 Nov 2012 10:05:58 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/steps/mail/func.inc | 2 +-
plugins/help/skins/classic/templates/help.html | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/plugins/help/skins/classic/templates/help.html b/plugins/help/skins/classic/templates/help.html
index 98beb66..2e430ec 100644
--- 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 @@
tab = '#helptab' + (action ? action : 'default');
}
$(tab).addClass('tablink-selected');
-}
+}
</script>
</head>
<body>
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9ad3a6e..10829d5 100644
--- a/program/steps/mail/func.inc
+++ b/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])
) {
--
Gitblit v1.9.1