clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5213 from fabrixxm/smallfix 

Create config keys if they not exists on set (bis)
This commit is contained in:
Hypolite Petovan 2018-06-14 08:43:57 -04:00 committed by GitHub
parent 9500c1b663 574bfecdfd
commit ecd8bb166c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/App.php
View File

@ -976,6 +976,10 @@ class App
if ($cat === 'config') { if ($cat === 'config') {
$this->config[$k] = $value; $this->config[$k] = $value;
} else { } else {
if (!isset($this->config[$cat])) {
$this->config[$cat] = [];
}
$this->config[$cat][$k] = $value; $this->config[$cat][$k] = $value;
} }
} }
@ -1034,6 +1038,14 @@ class App
// Only arrays are serialized in database, so we have to unserialize sparingly // Only arrays are serialized in database, so we have to unserialize sparingly
$value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v; $value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;
if (!isset($this->config[$uid])) {
$this->config[$uid] = [];
}
if (!isset($this->config[$uid][$cat])) {
$this->config[$uid][$cat] = [];
}
$this->config[$uid][$cat][$k] = $value; $this->config[$uid][$cat][$k] = $value;
} }