Fixed a bug where no input for search caused a JSMin error

Geeklog-Core · Jul 3, 2022 · 672ada7 · 672ada7
1 parent d333282
commit 672ada7
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/system/classes/Resource.php b/system/classes/Resource.php
@@ -32,7 +32,10 @@
 
 namespace Geeklog;
 
+use Exception;
 use JSMin\JSMin;
+use JSMin\UnterminatedRegExpException;
+use JSMin\UnterminatedStringException;
 use MatthiasMullie\Minify;
 use Mobile_Detect;
 
@@ -817,8 +820,15 @@ private function minifyJS(array $paths)
                 $data = @file_get_contents($path);
 
                 if ($data !== false) {
-                    $data = JSMin::minify($data);
-                    $retval .= $data . PHP_EOL;
+                    try {
+                        // Workaround
+                        $oldErrorReporting = error_reporting();
+                        error_reporting($oldErrorReporting & !E_DEPRECATED);
+                        $data = JSMin::minify($data);
+                        error_reporting($oldErrorReporting);
+                        $retval .= $data . PHP_EOL;
+                    } catch (Exception $e) {
+                    }
                 }
             }
         }