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

Merge branch 'develop' of github.com:getgrav/grav into feature-responsive-images

Browse Source 
* 'develop' of github.com:getgrav/grav:
  fix for #129 markdown images not found when base_url == '/' on homepage

Conflicts:
	system/src/Grav/Common/Markdown/ParsedownGravTrait.php
This commit is contained in:
Gert
2015-01-26 02:42:48 +01:00
parent 3ae5e3c569 304c7519d1
commit e268cda1b5
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,18 +104,23 @@ trait ParsedownGravTrait
//get the url and parse it
$url = parse_url(htmlspecialchars_decode($excerpt['element']['attributes']['src']));
<<<<<<< HEAD
=======
$path_parts = pathinfo($url['path']);
>>>>>>> 304c7519d14945d6b69bc83ecb89dbf5b3fbbee3
// if there is no host set but there is a path, the file is local
if (!isset($url['host']) && isset($url['path'])) {
// get the local path to page media if possible
if (strpos($url['path'], $this->page->url()) !== false) {
if ($path_parts['dirname'] == $this->page->url()) {
$url['path'] = ltrim(str_replace($this->page->url(), '', $url['path']), '/');
// get the media objects for this page
$media = $this->page->media();
} else {
// see if this is an external page to this one
$path_parts = pathinfo($url['path']);
$page_route = str_replace($this->base_url, '', $path_parts['dirname']);
$ext_page = $this->pages->dispatch($page_route, true);
@@ -177,7 +182,7 @@ trait ParsedownGravTrait
}
} else {
// not a current page media file, see if it needs converting to relative
$excerpt['element']['attributes']['src'] = $this->convertUrl(Uri::build_url($url));
$excerpt['element']['attributes']['src'] = Uri::build_url($url);
}
}
}