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

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

master
Mehdi Kabab 2009-07-20 20:07:53 +02:00 committed by Loic d'Anterroches
parent 95881bd7f1
commit 021805f1e1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/IDF/Template/IssueComment.php
View File

@ -49,7 +49,7 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
if ($request->rights['hasSourceAccess']) { 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', $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); 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); array($this, 'callbackSource'), $text);
} }
if ($wordwrap) $text = Pluf_Text::wrapHtml($text, 69, "\n"); if ($wordwrap) $text = Pluf_Text::wrapHtml($text, 69, "\n");
@ -143,12 +143,13 @@ class IDF_Template_IssueComment extends Pluf_Template_Tag
{ {
if (!$this->scm->isAvailable()) return $m[0]; if (!$this->scm->isAvailable()) return $m[0];
$file = $m[2]; $file = $m[2];
if (!empty($m[3])) $file = str_replace($m[3], '', $file);
$request_file_info = $this->scm->getPathInfo($file); $request_file_info = $this->scm->getPathInfo($file);
if (!$request_file_info) { if (!$request_file_info) {
return $m[0]; return $m[0];
} }
if ($request_file_info->type != 'tree') { 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]; return $m[0];
} }