From f28743011b0ef585ec5fae520b01aa2513cba394 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Tue, 10 May 2022 05:12:30 -0400 Subject: [PATCH] Prepare for version 5.1.4 Signed-off-by: Isaac Bennetch --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/classes/Version.php | 6 +++--- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 277bc12a3306..5d1dddeffcb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -5.1.4 (not yet released) +5.1.4 (2022-05-10) - issue #17287 Fixed sorting the database list with "statistics" enabled on "Data" column creates a PHP type error - issue #17368 Fix for invalid cache when losing access to config storage after it being cached - issue #17387 Fix session cookie not respecting the CookieSameSite configuration directive in PHP 7.2 diff --git a/README b/README index 29a321a1f142..ba2d82cc4523 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 5.1.4-dev +Version 5.1.4 A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index a7c5436cacfc..b0bc933dfaa5 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ # built documents. # # The short X.Y version. -version = '5.1.4-dev' +version = '5.1.4' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/classes/Version.php b/libraries/classes/Version.php index 89b1721e8910..7594ccf26888 100644 --- a/libraries/classes/Version.php +++ b/libraries/classes/Version.php @@ -12,12 +12,12 @@ final class Version { // The VERSION_SUFFIX constant is defined at libraries/vendor_config.php - public const VERSION = '5.1.4-dev' . VERSION_SUFFIX; + public const VERSION = '5.1.4' . VERSION_SUFFIX; public const SERIES = '5.1'; public const MAJOR = 5; public const MINOR = 1; public const PATCH = 4; public const ID = 50104; - public const PRE_RELEASE_NAME = 'dev'; - public const IS_DEV = true; + public const PRE_RELEASE_NAME = ''; + public const IS_DEV = false; } diff --git a/package.json b/package.json index 8c8c6500d819..980b05b68431 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phpmyadmin", - "version": "5.1.4-dev", + "version": "5.1.4", "description": "A web interface for MySQL and MariaDB", "repository": "https://github.com/phpmyadmin/phpmyadmin.git", "author": "The phpMyAdmin Team (https://www.phpmyadmin.net/team/)",