Indefero Commit Details

Date:

2011-05-04 04:22:24 (14 years 5 months ago)

Author:

William MARTIN

Branch:

develop, feature-issue_links, 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, release-1.2, release-1.3

Commit:

1940d5c0b5f71365bc006279fe2ce0fffdca167e

Parents:

3e2f95a1529222ce9639822769895bb02ecc619e

Message:

Fix issue 671 : Update the SSH Key preg pattern

Changes:

File differences

-80
81 81
82 82
83 
83
84
85
86
84 87
85 88
86 89
+        if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {␊
            return array('mtn', $m[1], $m[2]);␊
        }␊
        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S+))?$#', $this->content, $m)) {␊
        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S*))?$#', $this->content, $m)) {␊
            if (!isset($m[2])) {␊
                $m[2] = "";␊
            }␊
            return array('ssh', $m[2], $m[1]);␊
        }␊
␊
         if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {␊
             return array('mtn', $m[1], $m[2]);␊
         }␊
-        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S+))?$#', $this->content, $m)) {␊
+        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S*))?$#', $this->content, $m)) {␊
+            if (!isset($m[2])) {␊
+                $m[2] = "";␊
+            }␊
             return array('ssh', $m[2], $m[1]);␊
         }␊
 ␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags