From ea547c232e1a1953feb52910bcd1f4cbcd57b4de Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 7 Nov 2012 10:04:26 +0100 Subject: Don't include settings.css - is not needed anymore --- plugins/help/skins/classic/templates/help.html | 3 +-- 1 file changed, 1 insertion(+), 2 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 @@ <roundcube:object name="pagetitle" /> - -- cgit v1.2.3 From 9ce2398ef9b7eff40fd8998516e452b920a7866f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 7 Nov 2012 11:55:12 +0100 Subject: Fix regression in detecting if attachment should be displayed inline (is an image) --- program/steps/mail/func.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]) ) { -- cgit v1.2.3