The branch, MAINT_3_4_7 has been updated via ec040a1b6e9d19bf3439e3f8931a4d63720ce867 (commit) from 1b8f5a5c098905997a3072170d773a073331f7f6 (commit)

- Log ----------------------------------------------------------------- commit ec040a1b6e9d19bf3439e3f8931a4d63720ce867 Author: Marc Delisle marc@infomarc.info Date: Thu Nov 10 09:08:43 2011 -0500

3.4.7.1 release

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 0ccfc21..6ada51e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ======================

-3.4.7.1 (not yet released) +3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import (CVE-2011-4107).

3.4.7.0 (2011-10-23) diff --git a/Documentation.html b/Documentation.html index d376f73..083da6e 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.7 - Documentation</title> + <title>phpMyAdmin 3.4.7.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.7 + 3.4.7.1 Documentation </h1> </div> diff --git a/README b/README index ae117eb..488cb04 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================

-Version 3.4.7 +Version 3.4.7.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 824d04c..f42ad6e 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.7'); + $this->set('PMA_VERSION', '3.4.7.1'); /** * @deprecated */

hooks/post-receive