Null coalescing for e_theme constructor

e107inc · Jan 18, 2020 · cf8dc0b · cf8dc0b
1 parent f5f1454
commit cf8dc0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -133,6 +133,7 @@ public function testGetThemeLayout()
 
 			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']);