diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12f8319 --- /dev/null +++ b/.gitignore @@ -0,0 +1,46 @@ +# Composer +.composer +vendor/* +!*/vendor/* + +# Sass +.sass-cache + +# Grav Specific +backup/* +!backup/.* +cache/* +!cache/.* +assets/* +!assets/.* +logs/* +!logs/.* +images/* +!images/.* +user/accounts/* +!user/accounts/.* +user/data/* +!user/data/.* +user/plugins/* +!user/plugins/.* +user/themes/* +!user/themes/.* +user/localhost/config/security.yaml +user/config/security.yaml + +# OS Generated +.DS_Store* +ehthumbs.db +Icon? +Thumbs.db +*.swp + +# phpstorm +.idea/* + +# testing stuff +tests/_output/* +tests/_support/_generated/* +tests/cache/* +tests/error.log +system/templates/testing/* diff --git a/user/config/backups.yaml b/user/config/backups.yaml new file mode 100644 index 0000000..e69de29 diff --git a/user/config/media.yaml b/user/config/media.yaml new file mode 100644 index 0000000..e69de29 diff --git a/user/config/scheduler.yaml b/user/config/scheduler.yaml new file mode 100644 index 0000000..e69de29 diff --git a/user/config/streams.yaml b/user/config/streams.yaml new file mode 100644 index 0000000..e69de29 diff --git a/user/plugins/error/CHANGELOG.md b/user/plugins/error/CHANGELOG.md index 63255fa..c3d8e75 100644 --- a/user/plugins/error/CHANGELOG.md +++ b/user/plugins/error/CHANGELOG.md @@ -1,10 +1,16 @@ +# v1.7.1 +## 10/08/2020 + +1. [](#bugfix) + * Fixed error page being cached, fixes issue with non-existing resources which later become available + # v1.7.0 ## 07/01/2020 1. [](#new) * Require Grav v1.6 1. [](#bugfix) - * Added trnaslated title programmatically [#40](https://github.com/getgrav/grav-plugin-error/pull/40) + * Added translated title programmatically [#40](https://github.com/getgrav/grav-plugin-error/pull/40) # v1.6.2 ## 05/09/2019 diff --git a/user/plugins/error/blueprints.yaml b/user/plugins/error/blueprints.yaml index 62ab3d8..2192c16 100644 --- a/user/plugins/error/blueprints.yaml +++ b/user/plugins/error/blueprints.yaml @@ -1,5 +1,5 @@ name: Error -version: 1.7.0 +version: 1.7.1 description: Displays the error page. type: plugin slug: error diff --git a/user/plugins/error/error.php b/user/plugins/error/error.php index da0461e..e55caa3 100644 --- a/user/plugins/error/error.php +++ b/user/plugins/error/error.php @@ -53,8 +53,13 @@ class ErrorPlugin extends Plugin // Try to load user error page. $page = $pages->dispatch($this->config->get('plugins.error.routes.404', '/error'), true); - - if (!$page) { + if ($page) { + // Set default expires for error page. + $header = $page->header(); + if (!isset($header->expires)) { + $page->expires(0); + } + } else { // If none provided use built in error page. $page = new Page; $page->init(new \SplFileInfo(__DIR__ . '/pages/error.md')); diff --git a/user/plugins/error/pages/error.md b/user/plugins/error/pages/error.md index 615b50c..e9b344b 100644 --- a/user/plugins/error/pages/error.md +++ b/user/plugins/error/pages/error.md @@ -7,6 +7,7 @@ http_response_code: 404 twig_first: true process: twig: true +expires: 0 --- {{ 'PLUGIN_ERROR.ERROR_MESSAGE'|t }}