Merge pull request #6312 from annando/check-json

Checks if JSON is enabled
2018-12-23 18:53:32 -05:00
parent d7d685ad6b 75e63212d1
commit a16e8d97f6
2 changed files with 22 additions and 1 deletions
--- 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;
 	}