[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_6RC1-4-g362251a - Git

23 Aug 2010

The branch, QA_3_3 has been updated
       via  362251abbf49df2ea8e489ed7c88827e3a97d414 (commit)
       via  133a77fac7d31a38703db2099a90c1b49de62e37 (commit)
       via  a24e418527283936f09483e8cfcf8902c7409cbc (commit)
       via  1e7bc7d691fa8abcdde87a70ed6cef6f30cbe107 (commit)
      from  9036ac09e3b5a835550ef62ebb1e1ba202728710 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
 libraries/Error.class.php        |    2 +-
 libraries/dbi/mysql.dbi.lib.php  |    6 ++++++
 libraries/dbi/mysqli.dbi.lib.php |    5 +++++
 3 files changed, 12 insertions(+), 1 deletions(-)

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
hooks/post-receive
-- 
phpMyAdmin


    