From cf8dc0b9093c60ab881f1edc3829d695768a9c9a Mon Sep 17 00:00:00 2001
From: Nick Liu <deltik@gmx.com>
Date: Sat, 18 Jan 2020 11:59:18 +0100
Subject: [PATCH] Null coalescing for e_theme constructor

---
 e107_handlers/theme_handler.php       | 2 ++
 e107_tests/tests/unit/e_themeTest.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 311180247..972f0d3fb 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -57,6 +57,8 @@ class e_theme
 
 	function __construct($options=array())
 	{
+		$options['force'] = isset($options['force']) ? $options['force'] : false;
+
 		if(!empty($options['themedir']))
 		{
 			$this->_current = $options['themedir'];
diff --git a/e107_tests/tests/unit/e_themeTest.php b/e107_tests/tests/unit/e_themeTest.php
index 733967795..c8914fe4b 100644
--- a/e107_tests/tests/unit/e_themeTest.php
+++ b/e107_tests/tests/unit/e_themeTest.php
@@ -133,6 +133,7 @@
 
 			foreach($tests as $item=>$var)
 			{
+				$var['script'] = isset($var['script']) ? $var['script'] : null;
 
 				$result = $this->tm->getThemeLayout($pref, $defaultLayout, $var['url'], $var['script']);
 				$this->assertEquals($var['expected'],$result, "Wrong theme layout returned for item [".$item."] ".$var['url']);