From 54cd7f85b8457c28de93dce65b948c5cd1657c07 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 2 Mar 2018 15:39:59 -0600 Subject: [PATCH] `theme_var()` twig function now checks page header var first --- CHANGELOG.md | 1 + system/src/Grav/Common/Twig/TwigExtension.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03e3ec0bb..4b22a76af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ 1. [](#improved) * Vendor library updated to latest * Improved `Session` initialization + * Added ability to set a `theme_var()` option in page frontmatter 1. [](#bugfix) * Fixed issue with image alt tag always getting empted out unless set in markdown * Fixed issue with remote PHP version determination for Grav updates [#1883](https://github.com/getgrav/grav/issues/1883) diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php index 23af8addc..5e8b4bcd4 100644 --- a/system/src/Grav/Common/Twig/TwigExtension.php +++ b/system/src/Grav/Common/Twig/TwigExtension.php @@ -1129,7 +1129,9 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn */ public function themeVarFunc($var, $default = null) { - return $this->config->get('theme.' . $var, $default); + $header = $this->grav['page']->header(); + $header_classes = isset($header->$var) ? $header->$var : null; + return $header_classes ?: $this->config->get('theme.' . $var, $default); } /**