Page MenuHomestyx hydra
Files F570765

No OneTemporary
Actions

View Options

diff --git a/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php b/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
index 4789a66400..b7ae8ba003 100644
--- a/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
+++ b/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
@@ -1,74 +1,52 @@
<?php
/*
* 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
*/
final class PhabricatorRemarkupRulePhriction
extends PhutilRemarkupRule {
public function apply($text) {
return preg_replace_callback(
'@\B\\[\\[([^|\\]]+)(?:\\|([^\\]]+))?\\]\\]\B@U',
array($this, 'markupDocumentLink'),
$text);
}
public function markupDocumentLink($matches) {
$slug = trim($matches[1]);
$name = trim(idx($matches, 2, $slug));
+ $name = explode('/', trim($name, '/'));
+ $name = end($name);
- // If whatever is being linked to begins with "/" or has "://", treat it
- // as a URI instead of a wiki page.
- $is_uri = preg_match('@(^/)|(://)@', $slug);
-
- if ($is_uri) {
- $protocols = $this->getEngine()->getConfig(
- 'uri.allowed-protocols',
- array());
- $protocol = id(new PhutilURI($slug))->getProtocol();
- if (!idx($protocols, $protocol)) {
- // Don't treat this as a URI if it's not an allowed protocol.
- $is_uri = false;
- }
- }
-
- if ($is_uri) {
- $uri = $slug;
- // Leave the name unchanged, i.e. link the whole URI if there's no
- // explicit name.
- } else {
- $name = explode('/', trim($name, '/'));
- $name = end($name);
-
- $slug = PhrictionDocument::normalizeSlug($slug);
- $uri = PhrictionDocument::getSlugURI($slug);
- }
+ $slug = PhrictionDocument::normalizeSlug($slug);
+ $uri = PhrictionDocument::getSlugURI($slug);
return $this->getEngine()->storeText(
phutil_render_tag(
'a',
array(
'href' => $uri,
- 'class' => $is_uri ? null : 'phriction-link',
+ 'class' => 'phriction-link',
),
phutil_escape_html($name)));
}
}
diff --git a/src/infrastructure/markup/remarkup/markuprule/phriction/__init__.php b/src/infrastructure/markup/remarkup/markuprule/phriction/__init__.php
index f93c3ed5c5..1c70aaadfc 100644
--- a/src/infrastructure/markup/remarkup/markuprule/phriction/__init__.php
+++ b/src/infrastructure/markup/remarkup/markuprule/phriction/__init__.php
@@ -1,17 +1,16 @@
<?php
/**
* This file is automatically generated. Lint this module to rebuild it.
* @generated
*/
phutil_require_module('phabricator', 'applications/phriction/storage/document');
phutil_require_module('phutil', 'markup');
phutil_require_module('phutil', 'markup/engine/remarkup/markuprule/base');
-phutil_require_module('phutil', 'parser/uri');
phutil_require_module('phutil', 'utils');
phutil_require_source('PhabricatorRemarkupRulePhriction.php');

File Metadata

Mime Type
text/x-diff
Expires
Sat, Sep 20, 2:31 AM (3 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
241335
Default Alt Text
(3 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!)