Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-08 23:45:36 +02:00
Code Issues Packages Projects Releases Activity

Fixes for absolute images

Browse Source
This commit is contained in:
Andy Miller
2015-04-20 21:40:06 -06:00
parent 030d230312
commit 1ffd1cb6e7
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
system/src/Grav/Common/Markdown/ParsedownGravTrait.php
View File

@@ -239,20 +239,27 @@ trait ParsedownGravTrait
$url_bits = parse_url($normalized_path);
$full_path = $url_bits['path'];
// if this file exits, get the page and work with that
if (file_exists($full_path)) {
$page_path = pathinfo($full_path, PATHINFO_DIRNAME);
$path_info = pathinfo($full_path);
$page_path = $path_info['dirname'];
$filename = '';
// save the filename if a file is part of the path
$filename_regex = "/([\w\d-_]+\.([a-zA-Z]{2,4}))$/";
if (preg_match($filename_regex, $full_path, $matches)) {
if ($matches[2] != 'md') {
$filename = '/' . $matches[1];
}
} else {
$page_path = $full_path;
}
// get page instances and try to find one that fits
$instances = $this->pages->instances();
if (isset($instances[$full_path])) {
$target = $instances[$full_path];
} elseif (isset($instances[$page_path])) {
if (isset($instances[$page_path])) {
$target = $instances[$page_path];
}
// if a page target is found...
if ($target) {
$url_bits['path'] = $this->base_url . $target->route();
$url_bits['path'] = $this->base_url . $target->route() . $filename;
return Uri::buildUrl($url_bits);
}
}

2
system/src/Grav/Common/Page/Medium/ParsedownHtmlTrait.php
View File

@@ -23,7 +23,7 @@ trait ParsedownHtmlTrait
$element = $this->parsedownElement($title, $alt, $class, $reset);
if (!$this->parsedown) {
$this->parsedown = new Parsedown(null);
$this->parsedown = new Parsedown(null, null);
}
return $this->parsedown->elementToHtml($element);