Comments use named sub-patterns.

See #121
textile · Oct 31, 2013 · 7cc66bb · 7cc66bb
1 parent cf1bce2
commit 7cc66bb
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/src/Netcarver/Textile/Parser.php b/src/Netcarver/Textile/Parser.php
@@ -2116,11 +2116,7 @@ protected function replaceMarkers($text, $replacements)
     protected function getHTMLComments($text)
     {
         $text = preg_replace_callback(
-            "/
-            \<!--    #  start
-            (.*?)    # !content *not* greedy
-            -->      #  end
-            /sx",
+            "/\<!--(?P<content>.*?)-->/sx",
             array(&$this, "fParseHTMLComments"),
             $text
         );
@@ -2139,14 +2135,11 @@ protected function getHTMLComments($text)
 
     protected function fParseHTMLComments($m)
     {
-        list(, $content) = $m;
         if ($this->restricted) {
-            $content = $this->shelve($this->rEncodeHTML($content));
-        } else {
-            $content = $this->shelve($content);
+            $m['content'] = $this->rEncodeHTML($m['content']);
         }
 
-        return "<!--$content-->";
+        return '<!--'.$this->shelve($m['content']).'-->';
     }
 
     /**