From 35203b684d350d86b112512f819e174116368f38 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 13 Dec 2020 21:48:00 +0900
Subject: [PATCH] Fix #1484 missing extra_var groups in widget info

---
 modules/widget/widget.model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index b3c179e19..a159fd5a1 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -207,7 +207,7 @@ class widgetModel extends widget
 				$extra_var_count = count($extra_vars);
 
 				$buff .= sprintf('$widget_info->extra_var_count = %d;', $extra_var_count);
-				$buff .= '$widget_info->extra_var = new stdClass;';
+				$buff .= '$widget_info->extra_var = $widget_info->extra_var ?? new stdClass;';
 				for($i=0;$i<$extra_var_count;$i++)
 				{
 					unset($var);
@@ -326,7 +326,7 @@ class widgetModel extends widget
 		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
 		$extra_var_count = 0;
-		$buff[] = sprintf('$widgetStyle_info->extra_var = new stdClass();', $extra_var_count);
+		$buff[] = '$widgetStyle_info->extra_var = $widgetStyle_info->extra_var ?? new stdClass();';
 		foreach($extra_var_groups as $group)
 		{
 			$extra_vars = (!is_array($group->var)) ? array($group->var) : $group->var;