The branch, TESTING has been updated via 3a8a0bb72980135e1138ab75b7db49b4f76108a1 (commit) via 150798965d85ee7aee19076a8cd9f8f71770acc7 (commit) via fcc04991533333d18c86b3005967da2d75a56fb9 (commit) via 38547bea51e3ee1b84564dc111c64cc476d2e73c (commit) via 4341818d73d454451f024950a4ce0141608ac7f8 (commit) from c00efbe9888588c5b44cdc429fa59cc8b8157e38 (commit)

- Log ----------------------------------------------------------------- commit 3a8a0bb72980135e1138ab75b7db49b4f76108a1 Merge: c00efbe9888588c5b44cdc429fa59cc8b8157e38 150798965d85ee7aee19076a8cd9f8f71770acc7 Author: Marc Delisle marc@infomarc.info Date: Mon Nov 29 12:28:46 2010 -0500

Merge branch 'MAINT_3_3_8' into TESTING

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

Summary of changes: ChangeLog | 6 +++--- Documentation.html | 4 ++-- README | 7 +++---- libraries/Config.class.php | 2 +- libraries/common.lib.php | 2 +- translators.html | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 0a10389..b7274b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,9 @@ - bug #3077463 [core] Events were not copied when copying/renaming database - bug #1762306 [core] Copy database with view of a view

+3.3.8.1 (2010-11-29) +- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8 + 3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 @@ -141,9 +144,6 @@ 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after a page size increase, thanks to Martin Schönberger - mad05 -- bug #3054458 [core] Fixed displaying number of rows. -- bug #3035300 [parser] Fixed wrong definition of keywords. -- [setup] Fixed escaping of server name.

3.3.6.0 (2010-08-28) - bug #3033063 [core] Navi gets wrong db name diff --git a/Documentation.html b/Documentation.html index 848c19e..58538ce 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.0-alpha1 - Documentation</title> + <title>phpMyAdmin 3.3.8.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.0-alpha1 + 3.3.8.1 Documentation </h1> </div> diff --git a/README b/README index f08e7b0..74276f7 100644 --- a/README +++ b/README @@ -25,10 +25,9 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2, as published by the Free Software Foundation.

-This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + Version 3.3.8.1 + --------------- + http://www.phpmyadmin.net/

You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ae584da..743a729 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.0-alpha1'); + $this->set('PMA_VERSION', '3.3.8.1'); /** * @deprecated */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ec5100f..4b194de 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1769,7 +1769,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), $tmp = $tag_params; $tag_params = array(); if (!empty($tmp)) { - $tag_params['onclick'] = 'return confirmLink(this, '' . $tmp . '')'; + $tag_params['onclick'] = 'return confirmLink(this, '' . PMA_escapeJsString($tmp) . '')'; } unset($tmp); } diff --git a/translators.html b/translators.html index 89bb761..2094e3f 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,7 @@ <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.0-alpha1 - Official translators</title> + <title>phpMyAdmin 3.3.8.1 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>

@@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-alpha1 + 3.3.8.1 official translators list </h1> </div>

hooks/post-receive