From fd6a13558fae3308fbdaa872242a282e1d93810b Mon Sep 17 00:00:00 2001
From: Jerrad Thramer <jerrad@macpractice.com>
Date: Tue, 29 Jan 2013 14:22:36 -0800
Subject: [PATCH] Adding ':' as a supported character in Macros.

Summary: Adding ':' in order to support SA-style smiley conventions (e.g: :allears:) in Phabricator.

Test Plan: Tested working on local Phabricator copy.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D4727
---
 .../macro/controller/PhabricatorMacroEditController.php   | 8 ++++----
 .../markup/rule/PhabricatorRemarkupRuleImageMacro.php     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php
index 1d4e1e0d57..e48461a057 100644
--- a/src/applications/macro/controller/PhabricatorMacroEditController.php
+++ b/src/applications/macro/controller/PhabricatorMacroEditController.php
@@ -39,10 +39,10 @@ final class PhabricatorMacroEditController
         if (!strlen($macro->getName())) {
           $errors[] = pht('Macro name is required.');
           $e_name = pht('Required');
-        } else if (!preg_match('/^[a-z0-9_-]{3,}$/', $macro->getName())) {
-          $errors[] = pht('Macro must be at least three characters long and '.
-                      'contain only lowercase letters, digits, hyphen and '.
-                      'underscore.');
+        } else if (!preg_match('/^[a-z0-9:_-]{3,}$/', $macro->getName())) {
+          $errors[] = pht(
+            'Macro must be at least three characters long and contain only '.
+            'lowercase letters, digits, hyphens, colons and underscores.');
           $e_name = pht('Invalid');
         } else {
           $e_name = null;
diff --git a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
index c9c30b86ac..796b408828 100644
--- a/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
+++ b/src/infrastructure/markup/rule/PhabricatorRemarkupRuleImageMacro.php
@@ -10,7 +10,7 @@ final class PhabricatorRemarkupRuleImageMacro
 
   public function apply($text) {
     return preg_replace_callback(
-      '@^([a-zA-Z0-9_\-]+)$@m',
+      '@^([a-zA-Z0-9:_\-]+)$@m',
       array($this, 'markupImageMacro'),
       $text);
   }