[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-1649-g9bb3530

[Michal Čihař]

The branch, master has been updated
       via  9bb35300ebdcf242abcb23e55ad7164ab799d88f (commit)
      from  980a3bb86c3a2025189b64b96372fd7eac0cf0ca (commit)


- Log -----------------------------------------------------------------
commit 9bb35300ebdcf242abcb23e55ad7164ab799d88f
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Apr 20 08:19:55 2010 +0200

    Port can not be string.

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

Summary of changes:
 libraries/dbi/mysqli.dbi.lib.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 913bce6..fe83655 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -60,7 +60,7 @@ if (! defined('MYSQLI_TYPE_BIT')) {
  * @param   string  $user           mysql user name
  * @param   string  $password       mysql user password
  * @param   boolean $is_controluser
- * @param   array   $server host/port/socket 
+ * @param   array   $server host/port/socket
  * @param   boolean $auxiliary_connection (when true, don't go back to login if connection fails)
  * @return  mixed   false on error or a mysqli object on success
  */
@@ -68,7 +68,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
 {
     if ($server) {
           $server_port   = (empty($server['port']))
-                   ? ''
+                   ? false
                    : (int)$server['port'];
 	  $server_socket = (empty($server['socket']))
                    ? ''
@@ -107,7 +107,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
     if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) {
         $client_flags |= MYSQLI_CLIENT_SSL;
     }
-    
+
     if (!$server) {
       $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags);
 
@@ -126,7 +126,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
 	    }
         // we could be calling PMA_DBI_connect() to connect to another
         // server, for example in the Synchronize feature, so do not
-        // go back to main login if it fails 
+        // go back to main login if it fails
         if (! $auxiliary_connection) {
 	        PMA_log_user($user, 'mysql-denied');
             PMA_auth_fails();
@@ -231,7 +231,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0)
     }
 
     if ($r != FALSE && PMA_Tracker::isActive() == TRUE ) {
-        PMA_Tracker::handleQuery($query); 
+        PMA_Tracker::handleQuery($query);
     }
 
     return $r;


hooks/post-receive
-- 
phpMyAdmin