Merge branch 'develop' into develop-v5

# Conflicts: # CHANGELOG.md # composer.json # src/controllers/DefaultController.php
studioespresso · Feb 11, 2024 · 09035ba · 09035ba
2 parents 9a8abee + 8363dcc
commit 09035ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/src/SplashingImages.php b/src/SplashingImages.php
@@ -72,7 +72,7 @@ function(RegisterUrlRulesEvent $event) {
                 $event->rules['splashing-images/collections/<collection:\d+>'] = 'splashing-images/default/collection';
                 $event->rules['splashing-images/find'] = 'splashing-images/default/find';
                 $event->rules['splashing-images/search'] = 'splashing-images/default/search';
-                $event->rules['splashing-images/search/<query>/<page:\d+>'] = 'splashing-images/default/search';
+                $event->rules['splashing-images/search/<page:\d+>'] = 'splashing-images/default/search';
             }
         );
 

diff --git a/src/icon.svg b/src/icon.svg