banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
pull/42/head
Thomas Bruederli 12 years ago
parent 19b0d444e7 9ce2398ef9
commit 2ad0a8d3f6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File

3
plugins/help/skins/classic/templates/help.html
Unescape Escape View File

@ -4,7 +4,6 @@
<title><roundcube:object name="pagetitle" /></title> <title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" /> <roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/this/help.css" /> <link rel="stylesheet" type="text/css" href="/this/help.css" />
<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript"> <script type="text/javascript">
function help_init_settings_tabs() function help_init_settings_tabs()
{ {
@ -13,7 +12,7 @@ function help_init_settings_tabs()
tab = '#helptab' + (action ? action : 'default'); tab = '#helptab' + (action ? action : 'default');
} }
$(tab).addClass('tablink-selected'); $(tab).addClass('tablink-selected');
} }
</script> </script>
</head> </head>
<body> <body>

2
program/steps/mail/func.inc
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save