mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Null coalescing for e_theme constructor

Browse Source
This commit is contained in:
Nick Liu
2020-01-18 11:59:18 +01:00
parent f5f145485a
commit cf8dc0b909
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/theme_handler.php
View File

@@ -57,6 +57,8 @@ class e_theme
function __construct($options=array()) function __construct($options=array())
{ {
$options['force'] = isset($options['force']) ? $options['force'] : false;
if(!empty($options['themedir'])) if(!empty($options['themedir']))
{ {
$this->_current = $options['themedir']; $this->_current = $options['themedir'];

1
e107_tests/tests/unit/e_themeTest.php
View File

@@ -133,6 +133,7 @@
foreach($tests as $item=>$var) foreach($tests as $item=>$var)
{ {
$var['script'] = isset($var['script']) ? $var['script'] : null;
$result = $this->tm->getThemeLayout($pref, $defaultLayout, $var['url'], $var['script']); $result = $this->tm->getThemeLayout($pref, $defaultLayout, $var['url'], $var['script']);
$this->assertEquals($var['expected'],$result, "Wrong theme layout returned for item [".$item."] ".$var['url']); $this->assertEquals($var['expected'],$result, "Wrong theme layout returned for item [".$item."] ".$var['url']);