bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Apply suggestions from code review

Browse source 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
Philipp 2023-01-02 02:25:41 +01:00 committed by Philipp
parent 5ff1d431aa
commit ae1533e312
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Core/Config/Model/Config.php
View file

@ -32,9 +32,7 @@ use Friendica\Core\Config\ValueObject\Cache;
*/ */
class Config implements IManageConfigValues class Config implements IManageConfigValues
{ {
/** /** @var Cache */
* @var Cache
*/
protected $configCache; protected $configCache;
/** @var ConfigFileManager */ /** @var ConfigFileManager */

2
src/Core/Config/Util/ConfigFileManager.php
View file

@ -401,7 +401,7 @@ class ConfigFileManager
private function loadConfigFile(string $filepath): array private function loadConfigFile(string $filepath): array
{ {
if (file_exists($filepath)) { if (file_exists($filepath)) {
$config = include($filepath); $config = include $filepath;
if (!is_array($config)) { if (!is_array($config)) {
throw new ConfigFileException('Error loading config file ' . $filepath); throw new ConfigFileException('Error loading config file ' . $filepath);

11
src/Core/Config/ValueObject/Cache.php
View file

@ -212,13 +212,10 @@ class Cache
return null; return null;
} }
switch (true) { if (preg_match("|^a:[0-9]+:{.*}$|s", $value)) {
// manage array value return unserialize($value);
case preg_match("|^a:[0-9]+:{.*}$|s", $value): } else {
return unserialize($value); return $value;
default:
return $value;
} }
} }