From e433150a5a2a026eed1a798246812349848e295e Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Sat, 10 Jan 2015 16:07:33 -0700 Subject: [PATCH] Use page:// stream rather than PAGES_DIR constant --- system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php b/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php index b5b2defb7..ca67e6486 100644 --- a/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php +++ b/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php @@ -165,7 +165,8 @@ trait MarkdownGravLinkTrait // If this is a 'real' filepath clean it up if (file_exists($this->page->path() . '/' . parse_url($markdown_url, PHP_URL_PATH))) { - $relative_path = rtrim($this->base_url, '/') . preg_replace('/\/([\d]+.)/', '/', str_replace(PAGES_DIR, '/', $this->page->path())); + $pages_dir = self::$grav['locator']->findResource('page://'); + $relative_path = rtrim($this->base_url, '/') . preg_replace('/\/([\d]+.)/', '/', str_replace($pages_dir, '/', $this->page->path())); $markdown_url = preg_replace('/^([\d]+.)/', '', preg_replace('/\/([\d]+.)/', '/', trim(preg_replace('/[^\/]+(\.md$)/', '', $markdown_url), '/'))); }