Page MenuHomestyx hydra
Files F234694

No OneTemporary
Actions

View Options

diff --git a/src/infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php b/src/infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php
index 62b7ea8cc4..a992209e57 100644
--- a/src/infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php
+++ b/src/infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php
@@ -1,57 +1,63 @@
<?php
/*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @group markup
*/
abstract class PhabricatorRemarkupRuleObjectName
extends PhutilRemarkupRule {
abstract protected function getObjectNamePrefix();
public function apply($text) {
$prefix = $this->getObjectNamePrefix();
return preg_replace_callback(
- "@\b{$prefix}(\d+)(?:#(\d+))?\b@",
+ "@\b{$prefix}(\d+)(?:#([-\w\d]+))?\b@",
array($this, 'markupObjectNameLink'),
$text);
}
public function markupObjectNameLink($matches) {
$prefix = $this->getObjectNamePrefix();
$id = $matches[1];
if (isset($matches[2])) {
- $comment_id = $matches[2];
- $href = "/{$prefix}{$id}#comment-{$comment_id}";
- $text = "{$prefix}{$id}#{$comment_id}";
+ $href = $matches[2];
+ $text = $matches[2];
+ 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 {
$href = "/{$prefix}{$id}";
$text = "{$prefix}{$id}";
}
return $this->getEngine()->storeText(
phutil_render_tag(
'a',
array(
'href' => $href,
),
$text));
}
}

File Metadata

Mime Type
text/x-diff
Expires
Mon, Jul 28, 7:32 PM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
187417
Default Alt Text
(2 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)