Merge branch '4.0' into 'main'

Author: thorsten

nginx.conf

@@ -41,7 +41,7 @@ server {
     }
 
     # Additional configurations for specific file types
-    location ~* \.(svg|eot|ttf|woff|woff2)$ {
+    location ~* \.(svg|eot|ttf|woff|woff2|json)$ {
         add_header Access-Control-Allow-Origin "*";
     }
 

phpmyfaq/assets/src/configuration/update.ts

@@ -59,8 +59,8 @@ export const handleUpdateInformation = async (): Promise<void> => {
       if (error instanceof SyntaxError) {
         errorMessage =
           'The requested resource was not found on the server. ' +
-          "Please check your server configuration, in case you're using Apache, " +
-          'the RewriteBase in your .htaccess configuration.';
+          'Please check your server configuration, if you use Apache, the RewriteBase in your .htaccess ' +
+          'configuration. If you use nginx, please check your nginx rewrite configuration.';
       } else {
         errorMessage = error.message;
       }