Prevent exception being thrown when calling the Collator constructor …

…failed in a Windows environment with the Intl PHP Extension enabled [#961]
getgrav · Jul 27, 2016 · 74f6890 · 74f6890
1 parent ab17fb2
commit 74f6890
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
     * Fixed `Folder::delete` method to recursively remove files and folders and causing Upgrade to fail.
     * Fix [#952](https://github.com/getgrav/grav/issues/952) hypenize the session name.
     * If no parent is set and siblings collection is called, return a new and empty collection [grav-plugin-sitemap/issues/22](https://github.com/getgrav/grav-plugin-sitemap/issues/22)
+    * Prevent exception being thrown when calling the Collator constructor failed in a Windows environment with the Intl PHP Extension enabled [#961](https://github.com/getgrav/grav/issues/961)
 
 # v1.1.1
 ## 07/16/2016

diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
@@ -1065,8 +1065,13 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual
         } else {
             // else just sort the list according to specified key
             if (extension_loaded('intl')) {
-                $col = new \Collator(setlocale(LC_COLLATE, 0)); //`setlocale` with a 0 param returns the current locale set
-                $col->asort($list, $sort_flags);
+                $locale = setlocale(LC_COLLATE, 0); //`setlocale` with a 0 param returns the current locale set    
+                $col = \Collator::create($locale); 
+                if ($col) {
+                    $col->asort($list, $sort_flags);    
+                } else {
+                    asort($list, $sort_flags);    
+                }
             } else {
                 asort($list, $sort_flags);
             }