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>2012-08-12 17:14:23 +0400
committerMarc Delisle <marc@infomarc.info>2012-08-12 17:14:23 +0400
commitcc97d82fd15771dfee07445323db3473c2e2da60 (patch)
treeb8d65c5e081a3357c9fed66e87c79d0f3c715a6b
parente094f34bed5ef3fd9a4a3cd08e01ff59a260c730 (diff)
3.4.11.1 releaseRELEASE_3_4_11_1
-rw-r--r--ChangeLog3
-rw-r--r--Documentation.html4
-rw-r--r--README2
-rw-r--r--libraries/Config.class.php2
4 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f7d873a5c7..6ad3a07025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
phpMyAdmin - ChangeLog
======================
+3.4.11.1 (2012-08-12)
+- [security] Fixed XSS vulnerabilities, see PMASA-2012-4
+
3.4.11.0 (2012-04-14)
- bug #3486970 [import] Exception on XML import
- bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
diff --git a/Documentation.html b/Documentation.html
index 30568fc3c7..461b2eae2b 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>phpMyAdmin 3.4.11 - Documentation</title>
+ <title>phpMyAdmin 3.4.11.1 - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
- 3.4.11
+ 3.4.11.1
Documentation
</h1>
</div>
diff --git a/README b/README
index b6ff898fb0..33d529a98a 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
-Version 3.4.11
+Version 3.4.11.1
A set of PHP-scripts to manage MySQL over the web.
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 8f815b83b5..fe6528800f 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.4.11');
+ $this->set('PMA_VERSION', '3.4.11.1');
/**
* @deprecated
*/