revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-23 15:22:41 +01:00
Code Issues Releases Wiki Activity

Allow full anchors in remarkup object names

Browse source 
Summary: Remarkup object names require #1 for linking to comments which is not
very intuitive.

Test Plan:
  D1558#4e01328c
  D1558#1
  D1558#comment-1

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1565
This commit is contained in:
vrana 2012-02-03 11:28:28 -08:00
parent de7aa2186c
commit 5e58a016a5
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php
View file

@ -1,7 +1,7 @@
<?php <?php
/* /*
* Copyright 2011 Facebook, Inc. * Copyright 2012 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -27,7 +27,7 @@ abstract class PhabricatorRemarkupRuleObjectName
public function apply($text) { public function apply($text) {
$prefix = $this->getObjectNamePrefix(); $prefix = $this->getObjectNamePrefix();
return preg_replace_callback( return preg_replace_callback(
"@\b{$prefix}(\d+)(?:#(\d+))?\b@", "@\b{$prefix}(\d+)(?:#([-\w\d]+))?\b@",
array($this, 'markupObjectNameLink'), array($this, 'markupObjectNameLink'),
$text); $text);
} }
@ -37,9 +37,15 @@ abstract class PhabricatorRemarkupRuleObjectName
$id = $matches[1]; $id = $matches[1];
if (isset($matches[2])) { if (isset($matches[2])) {
$comment_id = $matches[2]; $href = $matches[2];
$href = "/{$prefix}{$id}#comment-{$comment_id}"; $text = $matches[2];
$text = "{$prefix}{$id}#{$comment_id}"; if (preg_match('@^(?:comment-)?(\d{1,7})$@', $href, $matches)) {
// Maximum length is 7 because 12345678 could be a file hash.
$href = "comment-{$matches[1]}";
$text = $matches[1];
}
$href = "/{$prefix}{$id}#{$href}";
$text = "{$prefix}{$id}#{$text}";
} else { } else {
$href = "/{$prefix}{$id}"; $href = "/{$prefix}{$id}";
$text = "{$prefix}{$id}"; $text = "{$prefix}{$id}";