Fallback to regular search if searching with `ignore_accented_charact…

…ers` on an unsupported charset raises an exception [#107]
getgrav · Apr 11, 2017 · a5b5786 · a5b5786
1 parent 42ae10d
commit a5b5786
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#bugfix)
     * Default `ignore_accented_characters` to false
+    * Fallback to regular search if searching with `ignore_accented_characters` on an unsupported charset raises an exception [#107](https://github.com/getgrav/grav-plugin-simplesearch/issues/107)
 
 # v1.10.0
 ## 01/23/2017

diff --git a/simplesearch.php b/simplesearch.php
@@ -235,7 +235,11 @@ public function onTwigSiteVariables()
     private function matchText($haystack, $needle) {
         if ($this->config->get('plugins.simplesearch.ignore_accented_characters')) {
             setlocale(LC_ALL, 'en_US');
-            $result = mb_stripos(iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $haystack), iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $needle));
+            try {
+                $result = mb_stripos(iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $haystack), iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $needle));
+            } catch (\Exception $e) {
+                $result = mb_stripos($haystack, $needle);
+            }
             setlocale(LC_ALL, '');
             return $result;
         } else {