From 1ef607e887e25aada921f09ee5a6f8c5631bf6ba Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Fri, 9 Oct 2020 21:36:34 -0400
Subject: [PATCH] Prepare for 4.9.6

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 ChangeLog                    | 4 ++++
 README                       | 2 +-
 doc/conf.py                  | 2 +-
 libraries/classes/Config.php | 2 +-
 package.json                 | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3d24224998..635131d611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.9.6 (2020-10-09)
+- issue        [security] Fix XSS vulnerability with the transformation feature (PMASA-2020-5)
+- issue        [security] Fix SQL injection vulnerability with search feature (PMASA-2020-6)
+
 4.9.5 (2020-03-20)
 - issue        [security] Fix SQL injection with certain usernames (PMASA-2020-2)
 - issue        [security] Fix SQL injection in particular search situations (PMASA-2020-3)
diff --git a/README b/README
index 90886d1c8b..7a97ca45cb 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.9.5
+Version 4.9.6
 
 A web interface for MySQL and MariaDB.
 
diff --git a/doc/conf.py b/doc/conf.py
index 668eb43dda..0b2d87d49b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -51,7 +51,7 @@ copyright = u'2012 - 2018, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.9.5'
+version = '4.9.6'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index b89a8bb13c..11c1b3869a 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -116,7 +116,7 @@ class Config
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.9.5');
+        $this->set('PMA_VERSION', '4.9.6');
         /* Major version */
         $this->set(
             'PMA_MAJOR_VERSION',
diff --git a/package.json b/package.json
index b608e4b625..4f394dd31c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phpmyadmin",
-  "version": "4.9.5",
+  "version": "4.9.6",
   "description": "A web interface for MySQL and MariaDB",
   "repository": "https://github.com/phpmyadmin/phpmyadmin.git",
   "author": "The phpMyAdmin Team <developers@phpmyadmin.net> (https://www.phpmyadmin.net/team/)",