Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches

2010-08-28 01:53:52 +05:30
parent cce1ef0eda ac5cab4f6f
commit 9c34a0eec9
172 changed files with 233085 additions and 159854 deletions
--- 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'];