Merge branch 'master' of https://github.com/facebook/phabricator

2011-04-20 17:08:29 -07:00
parent dcb2e43960 976d1e65df
commit c5157e821b
1 changed files with 2 additions and 3 deletions
--- 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);
  }