Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-22 14:38:13 +01:00
Code Issues Packages Projects Releases Activity

fix for non-url valid twig code in Markdown Link/Image

Browse Source
This commit is contained in:
Andy Miller
2015-01-20 09:35:30 -07:00
parent c9385632a9
commit 4cd4bb4202
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php
View File

@@ -17,6 +17,8 @@ trait MarkdownGravLinkTrait
protected $base_url;
protected $pages_dir;
protected $twig_link_regex = '/\!*\[(?:.*)\]\(([{{|{%|{#].*[#}|%}|}}])\)/';
/**
* Initialiazation function to setup key variables needed by the MarkdownGravLinkTrait
*
@@ -45,8 +47,16 @@ trait MarkdownGravLinkTrait
protected function inlineImage($excerpt)
{
// Run the parent method to get the actual results
$excerpt = parent::inlineImage($excerpt);
if (preg_match($this->twig_link_regex, $excerpt['text'], $matches)) {
$excerpt['text'] = str_replace($matches[1], '/', $excerpt['text']);
$excerpt = parent::inlineImage($excerpt);
$excerpt['element']['attributes']['src'] = $matches[1];
$excerpt['extent'] = $excerpt['extent'] + strlen($matches[1]) - 1;
return $excerpt;
} else {
$excerpt = parent::inlineImage($excerpt);
}
$actions = array();
// if this is an image
@@ -131,8 +141,16 @@ trait MarkdownGravLinkTrait
protected function inlineLink($excerpt)
{
// Run the parent method to get the actual results
$excerpt = parent::inlineLink($excerpt);
// do some trickery to get around Parsedown requirement for valid URL if its Twig in there
if (preg_match($this->twig_link_regex, $excerpt['text'], $matches)) {
$excerpt['text'] = str_replace($matches[1], '/', $excerpt['text']);
$excerpt = parent::inlineLink($excerpt);
$excerpt['element']['attributes']['href'] = $matches[1];
$excerpt['extent'] = $excerpt['extent'] + strlen($matches[1]) - 1;
return $excerpt;
} else {
$excerpt = parent::inlineLink($excerpt);
}
// if this is a link
if (isset($excerpt['element']['attributes']['href'])) {