@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | $properties = json_decode(file_get_contents($propFilePath), true); |
| 63 | 63 | |
| 64 | 64 | if (json_last_error() === JSON_ERROR_NONE) { |
| 65 | - if (isset($properties[ 'config' ])) { |
|
| 66 | - $this->presets = $properties[ 'presets' ]; |
|
| 67 | - unset($properties[ 'presets' ]); |
|
| 65 | + if (isset($properties['config'])) { |
|
| 66 | + $this->presets = $properties['presets']; |
|
| 67 | + unset($properties['presets']); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $this->properties = $properties; |
@@ -198,10 +198,10 @@ discard block |
||
| 198 | 198 | { |
| 199 | 199 | $extensions = ['.php', '.phtml', '.html', '.tpl']; |
| 200 | 200 | |
| 201 | - if (isset($this->presets[ 'extensions' ])) { |
|
| 202 | - array_unshift($partialsExtensions, $this->presets[ 'extension' ]); |
|
| 203 | - } elseif (isset($this->presets[ 'extension' ])) { |
|
| 204 | - array_unshift($extensions, $this->presets[ 'extension' ]); |
|
| 201 | + if (isset($this->presets['extensions'])) { |
|
| 202 | + array_unshift($partialsExtensions, $this->presets['extension']); |
|
| 203 | + } elseif (isset($this->presets['extension'])) { |
|
| 204 | + array_unshift($extensions, $this->presets['extension']); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | $found = false; |
@@ -253,10 +253,10 @@ discard block |
||
| 253 | 253 | if (isset($layout)) { |
| 254 | 254 | $extensions = ['.php', '.phtml', '.html', '.tpl']; |
| 255 | 255 | |
| 256 | - if (isset($this->presets[ 'extensions' ])) { |
|
| 257 | - array_unshift($partialsExtensions, $this->presets[ 'extension' ]); |
|
| 258 | - } elseif (isset($this->presets[ 'extension' ])) { |
|
| 259 | - array_unshift($extensions, $this->presets[ 'extension' ]); |
|
| 256 | + if (isset($this->presets['extensions'])) { |
|
| 257 | + array_unshift($partialsExtensions, $this->presets['extension']); |
|
| 258 | + } elseif (isset($this->presets['extension'])) { |
|
| 259 | + array_unshift($extensions, $this->presets['extension']); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | foreach ($extensions as $extension) { |
@@ -290,7 +290,7 @@ discard block |
||
| 290 | 290 | if ($this->layout instanceof Theme\Layout) { |
| 291 | 291 | |
| 292 | 292 | // load parent theme layout |
| 293 | - if($this->layout->getFilename() !== 'theme') { |
|
| 293 | + if ($this->layout->getFilename() !== 'theme') { |
|
| 294 | 294 | $themeLayout = $this->getLayout('theme'); |
| 295 | 295 | |
| 296 | 296 | // add theme layout public directory |