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

Accessing page with unsupported file extension (jpg, pdf, xsl) will use wrong mime type [#3031]

Browse Source
This commit is contained in:
Matias Griese
2020-10-08 13:02:47 +03:00
parent 3821ae441f
commit 1eb85b366d
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.7.0-rc.18
## mm/dd/2020
1. [](#bugfix)
* Accessing page with unsupported file extension (jpg, pdf, xsl) will use wrong mime type [#3031](https://github.com/getgrav/grav/issues/3031)
# v1.7.0-rc.17
## 10/07/2020

8
system/src/Grav/Common/Twig/Twig.php
View File

@@ -374,7 +374,9 @@ class Twig
{
// set the page now its been processed
$this->grav->fireEvent('onTwigSiteVariables');
/** @var Pages $pages */
$pages = $this->grav['pages'];
/** @var PageInterface $page */
$page = $this->grav['page'];
$content = $page->content();
@@ -395,6 +397,7 @@ class Twig
// Get Twig template layout
$template = $this->getPageTwigTemplate($page, $format);
$page->templateFormat($format);
try {
$output = $this->twig->render($template, $vars + $twig_vars);
@@ -445,7 +448,7 @@ class Twig
* @param string|null $format
* @return string
*/
public function getPageTwigTemplate($page, $format = null)
public function getPageTwigTemplate($page, &$format = null)
{
$template = $page->template();
$extension = $format ?: $page->templateFormat();
@@ -463,14 +466,17 @@ class Twig
// Try with template + html.twig
if ($twig_extension !== TEMPLATE_EXT && $loader->exists($template . TEMPLATE_EXT)) {
$page_template = $template . TEMPLATE_EXT;
$format = 'html';
// Try with default and original extension
} elseif ($loader->exists('default' . $twig_extension)) {
$page_template = 'default' . $twig_extension;
// Else try default + default extension
} elseif (!$page->isModule() && $loader->exists('default' . TEMPLATE_EXT)) {
$page_template = 'default' . TEMPLATE_EXT;
$format = 'html';
} else {
$page_template = 'modular/default' . TEMPLATE_EXT;
$format = 'html';
}
}
}