From f698e860cf3d48cc8a948825d71e8c458b93632e Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Thu, 5 Apr 2012 14:59:58 -0700
Subject: [PATCH] Remove duplicate remarkup rule

Summary: D2110

Test Plan:
  [[wiki]]
  [[http://example.com]]
  [[http://example.com | example.com]]

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D2111
---
 .../PhabricatorRemarkupRulePhriction.php      | 32 +++----------------
 .../markuprule/phriction/__init__.php         |  1 -
 2 files changed, 5 insertions(+), 28 deletions(-)

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
@@ -33,40 +33,18 @@ final class PhabricatorRemarkupRulePhriction
 
     $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
@@ -10,7 +10,6 @@ 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');