The branch, master has been updated via 5c63cbd23127f6ad241f354eeaf02f8331449d7c (commit) via 362251abbf49df2ea8e489ed7c88827e3a97d414 (commit) via 133a77fac7d31a38703db2099a90c1b49de62e37 (commit) via a24e418527283936f09483e8cfcf8902c7409cbc (commit) via 9036ac09e3b5a835550ef62ebb1e1ba202728710 (commit) via 1e7bc7d691fa8abcdde87a70ed6cef6f30cbe107 (commit) from 0b015eeb5d220c14c0d63c8f8664ddd747838f31 (commit)
- Log ----------------------------------------------------------------- commit 5c63cbd23127f6ad241f354eeaf02f8331449d7c Merge: 0b015eeb5d220c14c0d63c8f8664ddd747838f31 362251abbf49df2ea8e489ed7c88827e3a97d414 Author: Michal Čihař mcihar@novell.com Date: Mon Aug 23 17:10:04 2010 +0200
Merge branch 'QA_3_3'
Conflicts: Documentation.html README libraries/Config.class.php translators.html
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 2 ++ libraries/Error.class.php | 2 +- libraries/dbi/mysql.dbi.lib.php | 6 ++++++ libraries/dbi/mysqli.dbi.lib.php | 5 +++++ 4 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index f4964a1..eb47035 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,8 @@ $Id$ - [relations] Dropped WYSIWYG-PDF configuration variable. - rfe #806035, #686260 [relations] Export relations to Dia, SVG and others
+3.3.7.0 (not yet released) + 3.3.6.0 (not yet released) - bug #3033063 [core] Navi gets wrong db name - bug #3031705 [core] Fix generating condition for real numbers by comparing diff --git a/libraries/Error.class.php b/libraries/Error.class.php index b063995..c499d8d 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -318,7 +318,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 5af59bd..c5ff26f 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -317,6 +317,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 9e836eb..086b47a 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -374,6 +374,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
hooks/post-receive