From 85532fa50254fd986baef5bb737d43f5351f1721 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 4 May 2024 21:23:38 +0900 Subject: [PATCH] Fix #2341 undefined property access in WidgetController --- modules/widget/widget.controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php index d40697ed0..9c8275062 100644 --- a/modules/widget/widget.controller.php +++ b/modules/widget/widget.controller.php @@ -730,7 +730,7 @@ class WidgetController extends Widget { foreach($widgetstyle_extra_var_key['extra_var'] as $key => $val) { - $widgetstyle_extra_var->{$key} = $args->{$key}; + $widgetstyle_extra_var->{$key} = $args->{$key} ?? null; } } Context::set('widgetstyle_extra_var', $widgetstyle_extra_var); @@ -789,7 +789,7 @@ class WidgetController extends Widget { foreach($widget_info->extra_var as $key=>$val) { - $vars->{$key} = trim($request_vars->{$key}); + $vars->{$key} = trim($request_vars->{$key} ?? ''); } } // If the widget style @@ -802,7 +802,7 @@ class WidgetController extends Widget { if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox' || $val->type == 'textarea') { - $vars->{$key} = trim($request_vars->{$key}); + $vars->{$key} = trim($request_vars->{$key} ?? ''); } } }