From c3e0aeb05e4a1625c0ba7e6abe1227e35bf29dc5 Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Sat, 23 Jul 2022 13:56:59 +0200
Subject: [PATCH] chore: v3.1.6

---
 CHANGELOG.md                     | 9 ++++++++-
 package.json                     | 2 +-
 phpmyfaq/src/phpMyFAQ/System.php | 3 ++-
 scripts/version.sh               | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68d8d47822..360e05b3da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# phpMyFAQ 3.1.5
+# phpMyFAQ 3.1.6
 
 **Codename "Poseidon"**
 
@@ -6,6 +6,13 @@
 
 This is a log of major user-visible changes in each phpMyFAQ release.
 
+
+### phpMyFAQ v3.1.6 - 2022-07-23
+
+- fixed XSS vulnerability (jhond0e, Thorsten)
+- fixed dismiss error for cookie consent (Thorsten)
+- fixed minor bugs (Thorsten)
+
 ### phpMyFAQ v3.1.5 - 2022-06-27
 
 - added compatibility with Elasticsearch v8+ (Thorsten)
diff --git a/package.json b/package.json
index 02c9cd33de..152af914e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thorsten/phpmyfaq",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "phpMyFAQ",
   "repository": "git://github.com/thorsten/phpMyFAQ.git",
   "author": "Thorsten Rinne",
diff --git a/phpmyfaq/src/phpMyFAQ/System.php b/phpmyfaq/src/phpMyFAQ/System.php
index b86cabc2bc..cc60af7c7d 100644
--- a/phpmyfaq/src/phpMyFAQ/System.php
+++ b/phpmyfaq/src/phpMyFAQ/System.php
@@ -45,7 +45,7 @@ class System
     /**
      * Patch level.
      */
-    private const VERSION_PATCH_LEVEL = 5;
+    private const VERSION_PATCH_LEVEL = 6;
 
     /**
      * Pre-release version.
@@ -340,6 +340,7 @@ public function createHashes(): string
             '/config/constants.php' => false,
             '/config/constants_elasticsearch.php' => false,
             '/config/database.php' => false,
+            '/config/elasticsearch.php' => false,
             '/config/ldap.php' => false,
         ];
         $current = '';
diff --git a/scripts/version.sh b/scripts/version.sh
index c9c7718822..dd44025154 100644
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 if [ "x${PMF_VERSION}" = "x" ]; then
-    PMF_VERSION="3.1.5"
+    PMF_VERSION="3.1.6"
 fi