From 8a39ee067b3d8b11e4f0f50a8bfaa91a91db012d Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Sat, 5 Jul 2014 09:47:25 -0700
Subject: [PATCH] Minor, don't link commits after a semicolon

Summary: This stops us from trying to capture commit refs in Diffusion URIs.

Auditors: btrahan
---
 .../markup/PhabricatorMarkupEngine.php             |  2 +-
 .../markup/rule/PhabricatorRemarkupRuleObject.php  | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
index fac08cbbce..df7fa0c887 100644
--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
@@ -41,7 +41,7 @@ final class PhabricatorMarkupEngine {
 
   private $objects = array();
   private $viewer;
-  private $version = 11;
+  private $version = 12;
 
 
 /* -(  Markup Pipeline  )---------------------------------------------------- */
diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php
index c22f4285c4..6879a54700 100644
--- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php
+++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php
@@ -1,8 +1,5 @@
 <?php
 
-/**
- * @group markup
- */
 abstract class PhabricatorRemarkupRuleObject
   extends PhutilRemarkupRule {
 
@@ -119,13 +116,14 @@ abstract class PhabricatorRemarkupRuleObject
       $boundary = '\\B';
     }
 
-    // NOTE: The "(?<!#)" prevents us from linking "#abcdef" or similar. The
-    // "(?<!/)" prevents us from linking things in URLs. The "\b" allows us to
-    // link "(abcdef)" or similar without linking things in the middle of
-    // words.
+    // NOTE: The "(?<!#)" prevents us from linking "#abcdef" or similar.
+    // The "(?<!/)" prevents us from linking things in URIs.
+    // The "(?<!;)" prevents linking Diffusion URIs to commits.
+    // The "\b" allows us to link "(abcdef)" or similar without linking things
+    // in the middle of words.
 
     $text = preg_replace_callback(
-      '((?<!#)(?<!/)'.$boundary.$prefix.'('.$id.')(?:#([-\w\d]+))?\b)',
+      '((?<!#)(?<!/)(?<!;)'.$boundary.$prefix.'('.$id.')(?:#([-\w\d]+))?\b)',
       array($this, 'markupObjectReference'),
       $text);