Merge branch 'develop' into 1.7

# Conflicts:
#	composer.lock
#	system/defines.php
#	system/src/Grav/Common/Page/Medium/ImageMedium.php
#	system/src/Grav/Common/Page/Page.php
#	system/src/Grav/Common/Twig/TwigExtension.php
This commit is contained in:
Andy Miller 2021-01-11 16:29:39 -07:00
commit 9b34178332
No known key found for this signature in database
GPG Key ID: 2B07A47E470BCFDE
6 changed files with 8 additions and 4 deletions

View File

@ -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

View File

@ -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)

View File

@ -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 */

View File

@ -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

View File

@ -892,6 +892,7 @@ class TwigExtension extends AbstractExtension implements GlobalsInterface
$loader = new FilesystemLoader('.');
$env = new Environment($loader);
$env->addExtension($this);
$template = $env->createTemplate($twig);

View File

@ -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;