The branch, TESTING has been updated
via 401d55dc4b563298451428cf2dfb33644e50f953 (commit)
via 2e7f9b3cfacb49ba1f928f50e363c845af894575 (commit)
via 133a77fac7d31a38703db2099a90c1b49de62e37 (commit)
via a24e418527283936f09483e8cfcf8902c7409cbc (commit)
from d206c6b775d3774ce942d12e6109e6bfe652ef6b (commit)
- Log -----------------------------------------------------------------
commit 401d55dc4b563298451428cf2dfb33644e50f953
Merge: d206c6b775d3774ce942d12e6109e6bfe652ef6b
2e7f9b3cfacb49ba1f928f50e363c845af894575
Author: Marc Delisle <[email protected]>
Date: Sat Aug 28 10:48:56 2010 -0400
Merge branch 'MAINT_3_3_6' into TESTING
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++--
Documentation.html | 4 ++--
README | 4 ++--
libraries/Config.class.php | 2 +-
libraries/Error.class.php | 2 +-
libraries/dbi/mysql.dbi.lib.php | 6 ++++++
libraries/dbi/mysqli.dbi.lib.php | 5 +++++
translators.html | 4 ++--
8 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 81670e9..24cc757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
$Id$
$HeadURL:
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog
$
-3.3.6.0 (not yet released)
+3.3.6.0 (2010-08-28)
- bug #3033063 [core] Navi gets wrong db name
- bug #3031705 [core] Fix generating condition for real numbers by comparing
them to string.
@@ -19,7 +19,7 @@ $HeadURL:
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #3044189 [doc] Cleared documentation for hide_db.
- bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php.
-3.3.5.1 (2010-10-20)
+3.3.5.1 (2010-08-20)
- [core] Fixed various XSS issues, see PMASA-2010-5 for more details.
3.3.5.0 (2010-07-26)
diff --git a/Documentation.html b/Documentation.html
index 3ef61da..7cacfdb 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,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.3.6-rc1 - Documentation</title>
+ <title>phpMyAdmin 3.3.6 - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -18,7 +18,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.3.6-rc1
+ 3.3.6
Documentation
</h1>
</div>
diff --git a/README b/README
index 141934b..8810ad1 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
- Version 3.3.6-rc1
- -----------------
+ Version 3.3.6
+ -------------
http://www.phpmyadmin.net/
Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 2dab78d..afd226c 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.3.6-rc1');
+ $this->set('PMA_VERSION', '3.3.6');
/**
* @deprecated
*/
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index 849287e..9f0ae9a 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -319,7 +319,7 @@ class PMA_Error extends PMA_Message
if (in_array($function, $include_functions)) {
echo PMA_Error::relPath($arg);
} elseif (is_scalar($arg)) {
- echo gettype($arg) . ' ' . $arg;
+ echo gettype($arg) . ' ' . htmlspecialchars($arg);
} else {
echo gettype($arg);
}
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index 4750ee2..bf16114 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -321,6 +321,12 @@ function PMA_DBI_get_client_info()
function PMA_DBI_getError($link = null)
{
$GLOBALS['errno'] = 0;
+
+ /* Treat false same as null because of controllink */
+ if ($link === false) {
+ $link = null;
+ }
+
if (null === $link && isset($GLOBALS['userlink'])) {
$link =& $GLOBALS['userlink'];
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 9672385..2c00bcd 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -379,6 +379,11 @@ function PMA_DBI_getError($link = null)
{
$GLOBALS['errno'] = 0;
+ /* Treat false same as null because of controllink */
+ if ($link === false) {
+ $link = null;
+ }
+
if (null === $link && isset($GLOBALS['userlink'])) {
$link =& $GLOBALS['userlink'];
// Do not stop now. We still can get the error code
diff --git a/translators.html b/translators.html
index f4d3a4b..c642c11 100644
--- a/translators.html
+++ b/translators.html
@@ -11,7 +11,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.3.6-rc1 - Official translators</title>
+ <title>phpMyAdmin 3.3.6 - Official translators</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@@ -19,7 +19,7 @@
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/";>php<span
class="myadmin">MyAdmin</span></a>
- 3.3.6-rc1
+ 3.3.6
official translators list
</h1>
</div>
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
