From dfbdf46085cc57b8ce57fdf5ab6dd78cfee6e69b Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 3 Apr 2020 17:09:26 +0900 Subject: [PATCH] Fix #1262 --- classes/display/DisplayHandler.class.php | 4 ++-- modules/admin/admin.admin.controller.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php index 475a31d23..7d1f4017f 100644 --- a/classes/display/DisplayHandler.class.php +++ b/classes/display/DisplayHandler.class.php @@ -170,8 +170,8 @@ class DisplayHandler extends Handler } // Do not display debugging information if there is no output. - $display_types = config('debug.display_type'); - if (!is_array($display_types)) + $display_types = config('debug.display_type') ?: []; + if ($display_types && !is_array($display_types)) { $display_types = array($display_types); } diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index 02ac4e677..3fccfd710 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -817,7 +817,7 @@ class adminAdminController extends admin $vars = Context::getRequestVars(); // Save display type settings - $display_type = array_values(array_filter($vars->debug_display_type, function($str) { + $display_type = array_values(array_filter($vars->debug_display_type ?: [], function($str) { return in_array($str, ['panel', 'comment', 'file']); }));