Indefero Commit Details

Date:

2009-07-20 13:07:53 (15 years 9 months ago)

Author:

Mehdi Kabab

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:

021805f1e131b851830c8096b4161bbbb1070ae0

Parents:

95881bd7f1284a3d7c158d09633ac0e571ba76de

Message:

Fixed issue 270, 'src:' autolinking doesn't work if path contains spaces.

Changes:

File differences

-49
50 50
51 51
52 
52
53 53
54 54
55 55
... ...
143 143
144 144
145 145
146
146 147
147 148
148 149
149 150
150 151
151 
152
152 153
153 154
154 155
+        if ($request->rights['hasSourceAccess']) {␊
            $text = preg_replace_callback('#(commits?\s+)([0-9a-f]{1,40}(?:(?:\s+and|\s+or|,)\s+[0-9a-f]{1,40})*)\b#i',␊
                                          array($this, 'callbackCommits'), $text);␊
            $text = preg_replace_callback('#(src:)([^\s\(\)]+)#im',␊
            $text = preg_replace_callback('#(src:)([^\s\(\)\\\\]+(?:(\\\\)\s+[^\s\(\)\\\\]+){0,})+#im',␊
                                          array($this, 'callbackSource'), $text);␊
        }␊
        if ($wordwrap) $text = Pluf_Text::wrapHtml($text, 69, "\n");␊

    {␊
        if (!$this->scm->isAvailable()) return $m[0];␊
        $file = $m[2];␊
        if (!empty($m[3])) $file = str_replace($m[3], '', $file);␊
        $request_file_info = $this->scm->getPathInfo($file);␊
        if (!$request_file_info) {␊
            return $m[0];␊
        }␊
        if ($request_file_info->type != 'tree') {␊
            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $this->scm->getMainBranch(), $file)).'">'.$m[2].'</a>';␊
            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $this->scm->getMainBranch(), $file)).'">'.$file.'</a>';␊
        }␊
        return $m[0];␊
    }␊
 ...
         if ($request->rights['hasSourceAccess']) {␊
             $text = preg_replace_callback('#(commits?\s+)([0-9a-f]{1,40}(?:(?:\s+and|\s+or|,)\s+[0-9a-f]{1,40})*)\b#i',␊
                                           array($this, 'callbackCommits'), $text);␊
-            $text = preg_replace_callback('#(src:)([^\s\(\)]+)#im',␊
+            $text = preg_replace_callback('#(src:)([^\s\(\)\\\\]+(?:(\\\\)\s+[^\s\(\)\\\\]+){0,})+#im',␊
                                           array($this, 'callbackSource'), $text);␊
         }␊
         if ($wordwrap) $text = Pluf_Text::wrapHtml($text, 69, "\n");␊
     {␊
         if (!$this->scm->isAvailable()) return $m[0];␊
         $file = $m[2];␊
+        if (!empty($m[3])) $file = str_replace($m[3], '', $file);␊
         $request_file_info = $this->scm->getPathInfo($file);␊
         if (!$request_file_info) {␊
             return $m[0];␊
         }␊
         if ($request_file_info->type != 'tree') {␊
-            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $this->scm->getMainBranch(), $file)).'">'.$m[2].'</a>';␊
+            return $m[1].'<a href="'.Pluf_HTTP_URL_urlForView('IDF_Views_Source::tree', array($this->project->shortname, $this->scm->getMainBranch(), $file)).'">'.$file.'</a>';␊
         }␊
         return $m[0];␊
     }␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags