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-10-21 18:07:51 +0400
committerMarc Delisle <marc@infomarc.info>2014-10-21 18:07:51 +0400
commitd0f7dc79905f4795d328a018772871f9f98957fc (patch)
treed22295ba13983642b35f413680ad636258c22994
parenta150ea1df477fcc9a79bbdf3f26b40d9e333bcf1 (diff)
4.0.10.5 releaseRELEASE_4_0_10_5
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 13e5fe471e..a7900d358f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
phpMyAdmin - ChangeLog
======================
-4.0.10.5 (not yet released)
+4.0.10.5 (2014-10-21)
- bug #4562 [security] XSS in debug SQL output
- bug #4563 [security] XSS in monitor query analyzer
diff --git a/README b/README
index fdd5919fe9..20a291d00f 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 4.0.10.4
+Version 4.0.10.5
A set of PHP-scripts to manage MySQL over the web.
diff --git a/doc/conf.py b/doc/conf.py
index 41172fa6b7..1710d9b423 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.4'
+version = '4.0.10.5'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 15687a67f6..9a7e496a07 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.4');
+ $this->set('PMA_VERSION', '4.0.10.5');
/**
* @deprecated
*/