mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fix error when executing method SSViewer::templates() when $subTemplates is still null
Without the fix this causes the framework to throw a 500 error: `ERROR [Warning]: array_merge(): Expected parameter 2 to be an array, null given` I noticed the error while doing a search with the `GridFieldAddExistingAutocompleter`. The error probably gets supressed on live environments.
This commit is contained in:
parent
715208539e
commit
ecb233012d
@ -167,7 +167,7 @@ class SSViewer implements Flushable
|
|||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
*/
|
*/
|
||||||
protected $subTemplates = null;
|
protected $subTemplates = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var bool
|
* @var bool
|
||||||
|
Loading…
Reference in New Issue
Block a user