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

PATCH: Prevents calling strpos with empty needle

Browse Source 
We happen to run into this warning:
```
[Warning] strpos(): Empty needle
Line 2618 in ./framework/i18n/i18n.php

2618    strpos($theme, (string)Config::inst()->get('SSViewer', 'theme')) === 0
```
I suggest to test the needle against emptyness before invoking strpos.
This commit is contained in:
Samuel Amoser 2020-08-18 15:16:07 +02:00 committed by GitHub
parent 38306217ba
commit 69a8836910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i18n/i18n.php
View File

@ -2614,8 +2614,10 @@ class i18n extends SS_Object implements TemplateGlobalProvider, Flushable {
$themesBase = Director::baseFolder() . '/themes';
if(is_dir($themesBase)) {
foreach(scandir($themesBase) as $theme) {
$themename = (string)Config::inst()->get('SSViewer', 'theme');
if(
strpos($theme, (string)Config::inst()->get('SSViewer', 'theme')) === 0
!empty($themename)
&& strpos($theme, $themename) === 0
&& file_exists("{$themesBase}/{$theme}/lang/")
) {
$filename = $adapter->getFilenameForLocale($locale);