Indefero Commit Details

Date:

2010-09-14 07:22:34 (14 years 7 months ago)

Author:

Thomas Keller

Branch:

develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, master, release-1.1, release-1.2, release-1.3

Commit:

0897c8608fcea784ca9dee16fba3c12bb52621a6

Parents:

adae73080c7f83ed3f6db21469edd531a85f8084

Message:

Allow the upload of SSH keys without the optional comment field (fixes issue 531 - thanks William!)

Changes:

File differences

-204
205 205
206 206
207 
207
208 208
209 209
210 210
+            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)) {␊
             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)) {␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags