Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2015-05-13 18:22:42 +0300
committerMarc Delisle <marc@infomarc.info>2015-05-13 18:22:42 +0300
commit409c9bc50aa447c52d334c839f4aa239f66c5e03 (patch)
treebfc6654f080409d1deb53e2a71681dbd8564da8c
parent5ebc4daf131dd3bd646326267f3e765d0249bbb4 (diff)
4.4.6.1 releaseRELEASE_4_4_6_1
Signed-off-by: Marc Delisle <marc@infomarc.info>
-rw-r--r--ChangeLog2
-rw-r--r--README2
-rw-r--r--doc/conf.py2
-rw-r--r--libraries/Config.class.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c3c8be499..562a3bde6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.4.6.1 (Not yet released)
+4.4.6.1 (2015-05-13)
- bug #4899 [security] CSRF vulnerability in setup
- bug #4900 [security] Vulnerability allowing man-in-the-middle attack
diff --git a/README b/README
index 2565996c2d..8af7ba62a8 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.4.6
+Version 4.4.6.1
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 369da9c116..1ee9e119e5 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.6'
+version = '4.4.6.1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index bd7ff04a44..b3c3f4f807 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.6');
+ $this->set('PMA_VERSION', '4.4.6.1');
/**
* @deprecated
*/