beenull/yellow
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Markdown update (bug fix for PHP closures)

Browse source
This commit is contained in:
markseu 2014-07-10 11:02:56 +02:00
parent 0c9d4bcc76
commit b4a8aec533
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
system/core/core-markdownextra.php
View file

@ -5,7 +5,7 @@
// Markdown extra core plugin
class YellowMarkdownExtra
{
const Version = "0.3.5";
const Version = "0.3.6";
var $yellow; //access to API
// Handle plugin initialisation
@ -18,7 +18,7 @@ class YellowMarkdownExtra
function onParseContentText($page, $text)
{
$markdown = new YellowMarkdownExtraParser($this->yellow, $page);
return $markdown->transformText($text);
return $markdown->transformText($page, $text);
}
}
@ -38,14 +38,14 @@ class YellowMarkdownExtraParser extends MarkdownExtraParser
}
// Transform page text
function transformText($text)
function transformText($page, $text)
{
$text = preg_replace("/@pageRead/i", $this->page->get("pageRead"), $text);
$text = preg_replace("/@pageEdit/i", $this->page->get("pageEdit"), $text);
$text = preg_replace("/@pageError/i", $this->page->get("pageError"), $text);
$callback = function($matches)
$text = preg_replace("/@pageRead/i", $page->get("pageRead"), $text);
$text = preg_replace("/@pageEdit/i", $page->get("pageEdit"), $text);
$text = preg_replace("/@pageError/i", $page->get("pageError"), $text);
$callback = function($matches) use ($page)
{
$matches[2] = $this->yellow->toolbox->normaliseLocation($matches[2], $this->page->base, $this->page->location);
$matches[2] = $page->yellow->toolbox->normaliseLocation($matches[2], $page->base, $page->location);
return "<a$matches[1]href=\"$matches[2]\"$matches[3]>";
};
return preg_replace_callback("/<a(.*?)href=\"([^\"]+)\"(.*?)>/i", $callback, $this->transform($text));