fix: corrected paths for REST API v3.1

thorsten · Nov 2, 2024 · 5b5879f · 5b5879f
1 parent a902e7d
commit 5b5879f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/nginx.conf b/nginx.conf
@@ -125,8 +125,8 @@ server {
             # Administration API
             rewrite admin/api/(.*)                                  /admin/api/index.php last;
 
-            # REST API v3.0
-            rewrite api/v3.0/(.*)                                   /api/index.php last;
+            # REST API v3.0 and v3.1
+            rewrite ^api/v3\.[01]/(.*)                              /api/index.php last;
 
             break;
         }

diff --git a/phpmyfaq/.htaccess b/phpmyfaq/.htaccess
@@ -181,8 +181,8 @@ Header set Access-Control-Allow-Headers "Content-Type, Authorization"
     # Setup APIs
     RewriteRule ^api/setup/(check|backup|update-database) api/index.php [L,QSA]
 
-    # REST API v3.0
-    # * http://[...]/api/v3.0/<ACTION>
-    RewriteRule ^api/v3.0/(.*) api/index.php [L,QSA]
+    # REST API v3.0 and v3.1
+    # * http://[...]/api/v3.x/<ACTION>
+    RewriteRule ^api/v3\.[01]/(.*) api/index.php [L,QSA]
 
 </IfModule>
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Api/FaqController.php b/phpmyfaq/src/phpMyFAQ/Controller/Api/FaqController.php
@@ -417,14 +417,14 @@ public function getTrending(): JsonResponse
             {
                 "question": "How can I survive without phpMyFAQ?",
                 "url": "https://www.example.org/index.php?action=faq&cat=1&id=36&artlang=de",
-                "id": "8",
-                "order": "1"
+                "id": 8,
+                "order": 1
             },
             {
                 "question": "Is there life after death?",
                 "url": "https://www.example.org/index.php?action=faq&cat=1&id=1&artlang=en",
-                "id": "10",
-                "order": "2"
+                "id": 10,
+                "order": 2
             }
         ]')
     )]

diff --git a/phpmyfaq/src/phpMyFAQ/Faq.php b/phpmyfaq/src/phpMyFAQ/Faq.php
@@ -1608,8 +1608,8 @@ public function getStickyFaqsData(): array
                 $oLink->itemTitle = $row->thema;
                 $oLink->tooltip = $title;
                 $data['url'] = $oLink->toString();
-                $data['id'] = $row->id;
-                $data['order'] = $row->sticky_order;
+                $data['id'] = (int) $row->id;
+                $data['order'] = (int) $row->sticky_order;
 
                 $sticky[] = $data;
             }