friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6828 from friendica/fabrixxm-patch-typo 

Fix typo and Notice
This commit is contained in:
Hypolite Petovan 2019-03-08 11:17:25 -05:00 committed by GitHub
parent 4315fec756 d8e508567b
commit 0a7cf9e3c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Config/Cache/ConfigCacheLoader.php
View File

@ -128,7 +128,7 @@ class ConfigCacheLoader
unset($db_data);
}
if (isset($a->config['system']['db_charset'])) {
$a->config['database']['charset'] = $a->config['system']['charset'];
$a->config['database']['charset'] = $a->config['system']['db_charset'];
}
if (isset($pidfile)) {
$a->config['system']['pidfile'] = $pidfile;