Merge pull request #38 from wpstarter/dev

Fix warning on handleMatchedRoute when getShortcodeAtts not return array
wpstarter · May 5, 2023 · 404dc66 · 404dc66
2 parents e0dc260 + c047836
commit 404dc66
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/WpStarter/Wordpress/Routing/RouteCollection.php b/src/WpStarter/Wordpress/Routing/RouteCollection.php
@@ -64,9 +64,13 @@ protected function handleMatchedRoute(Request $request, $route)
 
     protected function getShortcodeAtts($content,$shortcode){
         preg_match_all( '/' . get_shortcode_regex($shortcode) . '/', $content, $matches, PREG_SET_ORDER );
-        if ( empty( $matches ) ) {
-            return false;
+        $atts=[];
+        if ( ! empty( $matches ) ) {
+            $atts = shortcode_parse_atts($matches[0][3]??'');
+        }
+        if(!is_array($atts)){
+            $atts=[];
         }
-        return shortcode_parse_atts($matches[0][3]??'');
+        return $atts;
     }
-}
+}