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

2018-12-27 01:47:53 -05:00
parent df7bf38f8a 86f4cc90a2
commit fabc90e9dd
420 changed files with 3127 additions and 2911 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;
 	}