resolved conflicts

Signed-off-by: bidi47 <bidi@apidemia.com>

Author: bidi47

bin/composer-post-install-script.php

@@ -40,6 +40,11 @@ function getEnvironment(): string
         'destination' => 'config/autoload/local.php',
         'environment' => [ENVIRONMENT_DEVELOPMENT, ENVIRONMENT_PRODUCTION],
     ],
+    [
+        'source'      => 'config/autoload/mail.local.php.dist',
+        'destination' => 'config/autoload/mail.local.php',
+        'environment' => [ENVIRONMENT_DEVELOPMENT, ENVIRONMENT_PRODUCTION],
+    ],
     [
         'source'      => 'config/autoload/local.test.php.dist',
         'destination' => 'config/autoload/local.test.php',

config/autoload/mail.global.php config/autoload/mail.local.php.distconfig/autoload/mail.global.php renamed to config/autoload/mail.local.php.dist

@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Mail configuration.
+ *
+ * Duplicate this file as `mail.local.php` and change its settings as required.
+ * `mail.local.php` is ignored by git and safe to use for sensitive data like SMTP credentials.
+ */
+
 declare(strict_types=1);
 
 $contactEmail = 'example@mail.com';

public/.htaccess

@@ -6,6 +6,7 @@ RedirectMatch 404 ^/(wp-login\.php|wp-admin|wp-content|wp-includes|xmlrpc\.php)
 # Block known spam/probe queries on any URL -> 404
 RewriteCond %{REQUEST_URI} ^/
 RewriteCond %{QUERY_STRING} ^post_type=wfacp_checkout$ [OR]
+RewriteCond %{QUERY_STRING} (^|&)feed= [OR]
 RewriteCond %{QUERY_STRING} rest_route
 RewriteRule .* - [R=404,L]