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

[friendica.git] / src / Core / Installer.php

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 2fd04523d9728a96f6e08c6c6ead3370afc24bed..4c30c94b04ec274d1780abdbe6395804e8723f9a 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -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;
        }