Zander/zanders-php-markdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into extra

Browse source
This commit is contained in:
Michel Fortin 2008-06-21 07:58:26 -04:00
commit 7b2fe0d55c
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
markdown.php
View file

@ -1133,15 +1133,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;
}
}