From 976d1e65dfa34e48c91d3db53373522dd9b1470d Mon Sep 17 00:00:00 2001 From: tuomaspelkonen Date: Tue, 19 Apr 2011 20:03:55 -0700 Subject: [PATCH] Fixed image macro with '-' in the name. Summary: Fixed the image macro regex not to use '-' as the separator. Also minor improvement to randomon. Test Plan: Tried different image marcors. Reviewed By: jungejason Reviewers: jungejason CC: epriestley, jungejason Differential Revision: 153 --- .../imagemacro/PhabricatorRemarkupRuleImageMacro.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php index 13a887fe44..97137c35bf 100644 --- a/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php +++ b/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php @@ -32,13 +32,12 @@ class PhabricatorRemarkupRuleImageMacro $this->images[$row->getName()] = $row->getFilePHID(); } $this->images[self::RANDOM_IMAGE_NAME] = ''; + $this->hash = 0; } public function apply($text) { - $this->hash = 0; - return preg_replace_callback( - '@\b([a-zA-Z0-9_\-]+)\b@U', + '@\b([a-zA-Z0-9_\-]+)\b@', array($this, 'markupImageMacro'), $text); }