From d0abf2eb66403a852e69804d54629db7383ab076 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 14 Aug 2019 20:36:33 +0300 Subject: [PATCH] Better support for `clockwork` logs --- CHANGELOG.md | 1 + admin.php | 2 +- blueprints.yaml | 4 ++-- classes/plugin/AdminBaseController.php | 2 +- classes/plugin/AdminController.php | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 506d1c57..6cab54a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ 1. [](#improved) * Better support for `array` field into `list` field * Made RAW blueprints (expert mode) to work properly with Flex Form + * Better support for `clockwork` logs 1. [](#bugfix) * Fixed issue with nested `list` fields both utilizing the custom `key` functionality * Regression: Page Preview not working, bad url [#1715](https://github.com/getgrav/grav-plugin-admin/issues/1715) diff --git a/admin.php b/admin.php index ee26e0d1..ae46772d 100644 --- a/admin.php +++ b/admin.php @@ -460,7 +460,7 @@ class AdminPlugin extends Plugin // Display RAW error message. $response = new Response(200, [], $this->admin->logEntry()); - $this->grav->exit($response); + $this->grav->close($response); } $self = $this; diff --git a/blueprints.yaml b/blueprints.yaml index e7291b13..9cb00c67 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -14,7 +14,7 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md license: MIT dependencies: - - { name: grav, version: '>=1.7.0-beta.4' } + - { name: grav, version: '>=1.7.0-beta.5' } - { name: form, version: '>=3.0.7' } - { name: login, version: '>=3.0.3' } - { name: email, version: '>=3.0.2' } @@ -163,7 +163,7 @@ form: label: Parents Levels size: small help: The number of levels to show in parent select list - + pages.show_modular: type: toggle label: Modular parents diff --git a/classes/plugin/AdminBaseController.php b/classes/plugin/AdminBaseController.php index f6f68920..d43ba54a 100644 --- a/classes/plugin/AdminBaseController.php +++ b/classes/plugin/AdminBaseController.php @@ -225,7 +225,7 @@ class AdminBaseController json_encode($json) ); - $this->grav->exit($response); + $this->grav->close($response); } /** diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php index cbede2be..768a7ee4 100644 --- a/classes/plugin/AdminController.php +++ b/classes/plugin/AdminController.php @@ -75,7 +75,7 @@ class AdminController extends AdminBaseController { $response = new Response(200); - $this->grav->exit($response); + $this->grav->close($response); } /** @@ -612,7 +612,7 @@ class AdminController extends AdminBaseController if (0 !== strpos($file, $backups_root_dir)) { $response = new Response(401); - $this->grav->exit($response); + $this->grav->close($response); } Utils::download($file, true);