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 branch '3.7' into 3

Browse Source
This commit is contained in:
Robbie Averill 2020-08-26 12:15:15 -07:00
commit 39c73e5286
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Constants.php
View File

@ -167,9 +167,10 @@ if(!isset($_SERVER['HTTP_HOST'])) {
*/
} else {
/**
* Fix magic quotes setting
* Check if magic quotes are enabled (only relevant for php 5.3)
* get_magic_quotes_gpc() call is suppressed to avoid php7.4 deprecation notice
*/
if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc()) {
if($_REQUEST) stripslashes_recursively($_REQUEST);
if($_GET) stripslashes_recursively($_GET);
if($_POST) stripslashes_recursively($_POST);

2
docs/en/00_Getting_Started/05_Coding_Conventions.md
View File

@ -48,7 +48,7 @@ Class and filenames are in `UpperCamelCase` format:
class MyClass {}
```
new word must be capitalized. Successive capitalized letters are used in
new words must be capitalized. Successive capitalized letters are used in
acronyms, e.g. a class `XMLImporter` is used while `XmlImporter` is not.
### Methods

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);