From 6ab95d9bec50f6be6b5439abed35f99ab3fa5cbc Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 7 Apr 2015 08:05:15 -0400 Subject: [PATCH 1/2] 4.4.1 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 62c146ba77..5e8bf25d42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -4.4.1.0 (not yet released) +4.4.1.0 (2015-04-07) - bug #4813 MySQL 5.7.6 and the Users menu tab - bug #4818 MySQL 5.7.6 and changing the password for another user - bug #4819 Request URI too large diff --git a/README b/README index 9d60e56951..b38904fc20 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.4.1-dev +Version 4.4.1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index a245b342c9..da086c2e67 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.4.1-dev' +version = '4.4.1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 213d034fb8..4cef03cf59 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.4.1-dev'); + $this->set('PMA_VERSION', '4.4.1'); /** * @deprecated */ From a93ad61caa9155d3ba1e49a2a213e3ccefeadb83 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 8 Apr 2015 07:03:32 -0400 Subject: [PATCH 2/2] Remove debugging code Signed-off-by: Marc Delisle --- libraries/OutputBuffering.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php index 43a6f3d208..fc25f01686 100644 --- a/libraries/OutputBuffering.class.php +++ b/libraries/OutputBuffering.class.php @@ -46,7 +46,6 @@ class PMA_OutputBuffering $mode = 0; } elseif (function_exists('ob_get_level') && ob_get_level() > 0) { // happens when php.ini's output_buffering is not Off - error_log('clean'); ob_end_clean(); $mode = 1; } else {