diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 33d857f90..b90f04b91 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -27,6 +27,9 @@ jobs: extensions: opcache, gd coverage: none + - name: Update composer + run: composer update + - name: Validate composer.json and composer.lock run: composer validate diff --git a/CHANGELOG.md b/CHANGELOG.md index 068a1c2d7..42fe7dc4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -575,7 +575,7 @@ * Optimization: Combine some early Grav processors into a single one # v1.6.31 -## mm/dd/2020 +## 12/14/2020 1. [](#improved) * Allow all CSS and JS via `robots.txt` [#2006](https://github.com/getgrav/grav/issues/2006) [#3067](https://github.com/getgrav/grav/issues/3067) diff --git a/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php index 280995585..b187cf7a3 100644 --- a/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php +++ b/system/src/Grav/Common/Media/Traits/ImageMediaTrait.php @@ -46,7 +46,7 @@ trait ImageMediaTrait 'resize', 'forceResize', 'cropResize', 'crop', 'zoomCrop', 'negate', 'brightness', 'contrast', 'grayscale', 'emboss', 'smooth', 'sharp', 'edge', 'colorize', 'sepia', 'enableProgressive', - 'rotate', 'flip', 'fixOrientation', 'gaussianBlur' + 'rotate', 'flip', 'fixOrientation', 'gaussianBlur', 'format' ]; /** @var array */ diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 0a8385188..208bf03ec 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -737,7 +737,7 @@ class Page implements PageInterface // never cache twig means it's always run after content $never_cache_twig = $this->header->never_cache_twig ?? $config->get( 'system.pages.never_cache_twig', - false + true ); // if no cached-content run everything diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php index 2f321e1a8..34a7dc0b1 100644 --- a/system/src/Grav/Common/Twig/TwigExtension.php +++ b/system/src/Grav/Common/Twig/TwigExtension.php @@ -892,6 +892,7 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface $loader = new FilesystemLoader('.'); $env = new Environment($loader); + $env->addExtension($this); $template = $env->createTemplate($twig); diff --git a/system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php b/system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php index fb95f35d9..571fd64a8 100644 --- a/system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php +++ b/system/src/Grav/Framework/Flex/Pages/Traits/PageContentTrait.php @@ -673,7 +673,7 @@ trait PageContentTrait $process_twig = $this->shouldProcess('twig') || $this->isModule(); $cache_enable = $this->getNestedProperty('header.cache_enable') ?? $config->get('system.cache.enabled', true); - $twig_first = $this->getNestedProperty('header.twig_first') ?? $config->get('system.pages.twig_first', true); + $twig_first = $this->getNestedProperty('header.twig_first') ?? $config->get('system.pages.twig_first', false); $never_cache_twig = $this->getNestedProperty('header.never_cache_twig') ?? $config->get('system.pages.never_cache_twig', false); $cached = null;