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

Merge branch '2018.12-rc' into task/move-config-to-php-array

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-27 01:47:53 -05:00 • committed by GitHub
commit fabc90e9dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
420 changed files with 3127 additions and 2911 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Core/Installer.php
View file

@ -440,6 +440,13 @@ class Installer
);
$returnVal = $returnVal ? $status : false;
$status = $this->checkFunction('json_encode',
L10n::t('JSON PHP module'),
L10n::t('Error: JSON PHP module required but not installed.'),
true
);
$returnVal = $returnVal ? $status : false;
return $returnVal;
}