From ef7806b5098d37a0f634deec82b5d58ce8f60fcd Mon Sep 17 00:00:00 2001 From: Gert Date: Mon, 26 Jan 2015 02:43:52 +0100 Subject: [PATCH] forgot to save after fixing merge conflict --- system/src/Grav/Common/Markdown/ParsedownGravTrait.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php index ff44f948d..c77b3c1e5 100644 --- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php +++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php @@ -104,11 +104,9 @@ 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'])) {