From 1ec51857f828c2d409ad76450695ca281ed89fc3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 23 Nov 2015 07:21:38 -0500 Subject: [PATCH 1/2] 4.5.2 release Signed-off-by: Marc Delisle --- ChangeLog | 2 +- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f01e3f3a3..9b69f1cc47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.5.2.0 (not yet released) +4.5.2.0 (2015-11-23) - issue #11589 Incorrect parameter in mysqli_fetch_fields() - issue #11592 Missing headers in zipped export - issue #11590 Parser: Array to string conversion diff --git a/README b/README index 1b6cf7de5b..0994dda6c6 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.2-dev +Version 4.5.2 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index fdd697df56..d0149465a7 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.5.2-dev' +version = '4.5.2' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index cfb4b66568..1492a549c3 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.5.2-dev'); + $this->set('PMA_VERSION', '4.5.2'); /** * @deprecated */ From 16d9e806713eabfa3f9a1d3971a14ab6984237a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 23 Dec 2015 09:55:36 +0100 Subject: [PATCH 2/2] Fix possible undefined variables in table operations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #11749 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/tbl_info.inc.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6a3c5ce930..c94ab0d325 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog - issue #11758 Missing quoting of table in ALTER CONVERT query - issue #11752 PMA 4.5.2 breaks MySQL Master-Master Cluster - issue #11757 Export and preview show different SQL for character set +- issue #11749 Fix possible undefined variables in table operations 4.5.2.0 (2015-11-23) - issue #11589 Incorrect parameter in mysqli_fetch_fields() diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index 1f70188e7b..e6d3a55a74 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -106,4 +106,6 @@ if ($showtable) { ? 'DEFAULT' : $pack_keys; unset($create_options, $each_create_option); -} // end if +} else { + $pack_keys = $row_format = null; +}// end if