From a9bdbe6cea568ca3a2c727211ac817537f3bbb1d Mon Sep 17 00:00:00 2001 From: Michel Fortin Date: Sat, 21 Jun 2008 07:58:10 -0400 Subject: [PATCH] Fixed a bug introduced while moving code to prepareItalicsAndBold. --- markdown.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/markdown.php b/markdown.php index ec0e5c3..8179b56 100644 --- a/markdown.php +++ b/markdown.php @@ -1124,15 +1124,18 @@ class Markdown_Parser { # Prepare regular expressions for seraching emphasis tokens in any # context. # - foreach ($this->em_relist as $em => $expression) { - foreach ($this->strong_relist as $strong => $expression) { + foreach ($this->em_relist as $em => $em_re) { + foreach ($this->strong_relist as $strong => $strong_re) { + # Construct list of allowed token expressions. + $token_relist = array(); if (isset($this->em_strong_relist["$em$strong"])) { $token_relist[] = $this->em_strong_relist["$em$strong"]; } - $token_relist[] = $this->strong_relist[$strong]; - $token_relist[] = $this->em_relist[$em]; - $token_re = '{('. implode('|', $token_relist) .')}'; + $token_relist[] = $em_re; + $token_relist[] = $strong_re; + # Construct master expression from list. + $token_re = '{('. implode('|', $token_relist) .')}'; $this->em_strong_prepared_relist["$em$strong"] = $token_re; } }