From b784dcd29f41beeb7099576d5e3e3ea45a83d3fc Mon Sep 17 00:00:00 2001
From: Michel Fortin <michel.fortin@michelf.com>
Date: Sat, 7 Jun 2008 10:18:00 -0400
Subject: [PATCH] Renamed a few more variables with _re prefix.

---
 markdown.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/markdown.php b/markdown.php
index 5f02635..7c74aac 100644
--- a/markdown.php
+++ b/markdown.php
@@ -1666,11 +1666,11 @@ class MarkdownExtra_Parser extends Markdown_Parser {
 	}
 	
 	
-	# Extra hashes used during extra transformations.
+	# Extra variables used during extra transformations.
 	var $footnotes = array();
 	var $footnotes_ordered = array();
 	var $abbr_desciptions = array();
-	var $abbr_word_re = array();
+	var $abbr_word_re = '';
 	
 	# Give the current footnote number.
 	var $footnote_counter = 1;
@@ -1871,13 +1871,15 @@ class MarkdownExtra_Parser extends Markdown_Parser {
 			
 			$tag  = $parts[1]; # Tag to handle.
 			$text = $parts[2]; # Remaining text after current tag.
+			$tag_re = preg_quote($tag); # For use in a regular expression.
 			
 			#
 			# Check for: Code span marker
 			#
 			if ($tag{0} == "`") {
 				# Find corresponding end marker.
-				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag.'(?!`)}', 
+				$tag_re = preg_quote($tag);
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
 					$text, $matches))
 				{
 					# End marker found: pass text unchanged until marker.
@@ -1900,7 +1902,8 @@ class MarkdownExtra_Parser extends Markdown_Parser {
 				}
 				else {
 					# Fenced code block marker: find matching end marker.
-					if (preg_match('{^(?>.*\n)+?'.trim($tag).' *\n}', $text, 
+					$tag_re = preg_quote(trim($tag));
+					if (preg_match('{^(?>.*\n)+?'.$tag_re.' *\n}', $text, 
 						$matches)) 
 					{
 						# End marker found: pass text unchanged until marker.