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>2014-11-20 18:09:42 +0300
committerMarc Delisle <marc@infomarc.info>2014-11-20 18:09:42 +0300
commit13a288d0da6e79b99acb9052bcf31b6650c624b5 (patch)
tree4b11e219e05b3de52b0b279aec49a9f5ca2fe635
parentc7685e5acd3f8e722f4f374c6fa821590865b68d (diff)
4.0.10.6 releaseRELEASE_4_0_10_6
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 4440e6339f..c0e57bef9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.0.10.6 (not yet released)
+4.0.10.6 (2014-11-20)
- bug #4578 [security] XSS vulnerability in table print view
- bug #4579 [security] XSS vulnerability in zoom search page
- bug #4594 [security] Path traversal in file inclusion of GIS factory
diff --git a/README b/README
index 20a291d00f..e39ef44eda 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.10.5
+Version 4.0.10.6
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 1710d9b423..d3ac475608 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -49,7 +49,7 @@ copyright = u'2012 - 2013, The phpMyAdmin devel team'
# built documents.
#
# The short X.Y version.
-version = '4.0.10.5'
+version = '4.0.10.6'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index a78bd77917..290c69ba2f 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -102,7 +102,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '4.0.10.5');
+ $this->set('PMA_VERSION', '4.0.10.6');
/**
* @deprecated
*/