diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-07 16:05:58 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-07 16:05:58 +0100 |
| commit | 2ad0a8d3f661046daa80d593c56a6a728a50a7f2 (patch) | |
| tree | c3c0f9d9b8982f63733b89fd3fdd175f11b37f0d | |
| parent | 19b0d444e7c3a4262f21414f55d2d8ece0cf5786 (diff) | |
| parent | 9ce2398ef9b7eff40fd8998516e452b920a7866f (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | plugins/help/skins/classic/templates/help.html | 3 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
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 98beb6655..2e430ecf3 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 @@ function help_init_settings_tabs() 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 9ad3a6e6f..10829d514 100644 --- 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]) ) { |