Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 10:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add test for Addon failures

Browse source
This commit is contained in:
Philipp 2023-01-08 02:28:27 +01:00
parent 0429a4e429
commit 2293ff6206
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
3 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -194,11 +194,13 @@ class ConfigFileManager
try {
if (flock($configStream, LOCK_SH)) {
clearstatcache(true, $filename);
if (($filesize = filesize($filename)) === 0) {
return;
}
$content = fread($configStream, filesize($filename));
$content = fread($configStream, $filesize);
if (!$content) {
throw new ConfigFileException(sprintf('Couldn\'t read file %s', $filename));
}

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

@ -283,7 +283,7 @@ class Cache
$keys = array_keys($config[$category]);
foreach ($keys as $key) {
if (!isset($this->config[$category][$key])) {
if (!key_exists($key, $this->config[$category] ?? [])) {
$return[$category][$key] = $config[$category][$key];
}
}