From 732ff8ecab1b3fde75d0a2bc9ad41cab29cf58b4 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 7 Sep 2018 10:36:56 +0300 Subject: [PATCH 1/2] Fixed `nicetime()` twig function --- CHANGELOG.md | 1 + system/src/Grav/Common/Twig/TwigExtension.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f1199115..0cc49fcf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ 1. [](#bugfix) * Allow `$page->slug()` to be called before `$page->init()` without breaking the page * Fix for `Page::translatedLanguages()` to use routes always [#2163](https://github.com/getgrav/grav/issues/2163) + * Fixed `nicetime()` twig function # v1.5.1 ## 08/23/2018 diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php index 74253d739..2de622bf0 100644 --- a/system/src/Grav/Common/Twig/TwigExtension.php +++ b/system/src/Grav/Common/Twig/TwigExtension.php @@ -155,7 +155,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn new \Twig_SimpleFunction('read_file', [$this, 'readFileFunc']), new \Twig_SimpleFunction('nicenumber', [$this, 'niceNumberFunc']), new \Twig_SimpleFunction('nicefilesize', [$this, 'niceFilesizeFunc']), - new \Twig_SimpleFunction('nicetime', [$this, 'nicetimeFilter']), + new \Twig_SimpleFunction('nicetime', [$this, 'nicetimeFunc']), // Translations new \Twig_simpleFunction('t', [$this, 'translate']), From bbc4fd6c79e734e54114b3524832f39798f89b7f Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Fri, 7 Sep 2018 13:13:33 +0300 Subject: [PATCH 2/2] Allow twig tags `{% script %}`, `{% style %}` and `{% switch %}` to be placed outside of blocks --- CHANGELOG.md | 1 + system/src/Grav/Common/Twig/Node/TwigNodeScript.php | 2 +- system/src/Grav/Common/Twig/Node/TwigNodeStyle.php | 2 +- system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cc49fcf3..77e958a0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Allow `$page->slug()` to be called before `$page->init()` without breaking the page * Fix for `Page::translatedLanguages()` to use routes always [#2163](https://github.com/getgrav/grav/issues/2163) * Fixed `nicetime()` twig function + * Allow twig tags `{% script %}`, `{% style %}` and `{% switch %}` to be placed outside of blocks # v1.5.1 ## 08/23/2018 diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeScript.php b/system/src/Grav/Common/Twig/Node/TwigNodeScript.php index c1c02580d..23f16a3c4 100644 --- a/system/src/Grav/Common/Twig/Node/TwigNodeScript.php +++ b/system/src/Grav/Common/Twig/Node/TwigNodeScript.php @@ -8,7 +8,7 @@ namespace Grav\Common\Twig\Node; -class TwigNodeScript extends \Twig_Node implements \Twig_NodeOutputInterface +class TwigNodeScript extends \Twig_Node implements \Twig_NodeCaptureInterface { protected $tagName = 'script'; diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php b/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php index 726e5a69b..ae30e43c4 100644 --- a/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php +++ b/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php @@ -8,7 +8,7 @@ namespace Grav\Common\Twig\Node; -class TwigNodeStyle extends \Twig_Node implements \Twig_NodeOutputInterface +class TwigNodeStyle extends \Twig_Node implements \Twig_NodeCaptureInterface { protected $tagName = 'style'; diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php b/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php index 97824cf03..a03faa5af 100644 --- a/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php +++ b/system/src/Grav/Common/Twig/Node/TwigNodeSwitch.php @@ -8,7 +8,7 @@ namespace Grav\Common\Twig\Node; -class TwigNodeSwitch extends \Twig_Node implements \Twig_NodeOutputInterface +class TwigNodeSwitch extends \Twig_Node { public function __construct( \Twig_Node $value,