Fix #1180 - PHP5.6 cannot catch all errors

fisharebest · Jan 22, 2017 · 444a65e · 444a65e
1 parent 5717665
commit 444a65e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/app/I18N.php b/app/I18N.php
@@ -403,9 +403,12 @@ public static function init($code = null) {
 
 		// Create a collator
 		try {
-			self::$collator = new Collator(self::$locale->code());
-			// Ignore upper/lower case differences
-			self::$collator->setStrength(Collator::SECONDARY);
+			// PHP 5.6 cannot catch errors, so test first
+			if (class_exists('Collator')) {
+				self::$collator = new Collator(self::$locale->code());
+				// Ignore upper/lower case differences
+				self::$collator->setStrength(Collator::SECONDARY);
+			}
 		} catch (Exception $ex) {
 			// PHP-INTL is not installed?  We'll use a fallback later.
 		}