From 9ccbcea743d4a97e945b690efc2912bf289bc45d Mon Sep 17 00:00:00 2001 From: William MARTIN Date: Wed, 5 Jan 2011 12:07:57 +0100 Subject: [PATCH 1/2] Fixed issue 557, better CSS to render UL/OL. --- www/media/idf/css/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css index ef64f05..a36e94c 100644 --- a/www/media/idf/css/style.css +++ b/www/media/idf/css/style.css @@ -702,6 +702,14 @@ div.deprecated-page { color: #a00; } +ul > li { + list-style: disc outside none; +} + +ol > li { + list-style: decimal outside none; +} + #branding { float: right; position: relative; From fd7a53a854329b4f03708b36eab439ecb750ddcf Mon Sep 17 00:00:00 2001 From: Thomas Keller Date: Wed, 5 Jan 2011 15:34:01 +0100 Subject: [PATCH 2/2] According to the base64 standard, zero, one or two fill bytes ("=") might pop up at the end, so always expecting "==" is plainly wrong (originates from 0897c860, fixes issue 592) --- src/IDF/Form/UserAccount.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IDF/Form/UserAccount.php b/src/IDF/Form/UserAccount.php index 7b6a5cb..d09417d 100644 --- a/src/IDF/Form/UserAccount.php +++ b/src/IDF/Form/UserAccount.php @@ -295,7 +295,7 @@ class IDF_Form_UserAccount extends Pluf_Form return ''; } - if (preg_match('#^ssh\-[a-z]{3}\s\S+==(\s\S+)?$#', $key)) { + if (preg_match('#^ssh\-[a-z]{3}\s\S+(\s\S+)?$#', $key)) { $key = str_replace(array("\n", "\r"), '', $key); if (Pluf::f('idf_strong_key_check', false)) {