tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #722 from sonet/2.4

Browse Source 
MINOR fixed array to string conversion to avoid PHP 5.4 warnings
This commit is contained in:
Ingo Schommer 2012-08-16 11:23:14 -07:00
commit 33b9b18a4c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SSViewer.php
View File

@ -159,7 +159,7 @@ class SSViewer {
} }
} }
if(substr((string) $templateList,-3) == '.ss') { if(is_string($templateList) && substr((string) $templateList,-3) == '.ss') {
$this->chosenTemplates['main'] = $templateList; $this->chosenTemplates['main'] = $templateList;
} else { } else {
if(!is_array($templateList)) $templateList = array($templateList); if(!is_array($templateList)) $templateList = array($templateList);