natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of git://projects.ceondo.com/indefero into develop

Browse Source
This commit is contained in:
William MARTIN 2011-01-05 17:21:35 +01:00
commit 0334e88625
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IDF/Form/UserAccount.php
View File

@ -295,7 +295,7 @@ class IDF_Form_UserAccount extends Pluf_Form
return ''; 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); $key = str_replace(array("\n", "\r"), '', $key);
if (Pluf::f('idf_strong_key_check', false)) { if (Pluf::f('idf_strong_key_check', false)) {

8
www/media/idf/css/style.css
View File

@ -702,6 +702,14 @@ div.deprecated-page {
color: #a00; color: #a00;
} }
ul > li {
list-style: disc outside none;
}
ol > li {
list-style: decimal outside none;
}
#branding { #branding {
float: right; float: right;
position: relative; position: relative;