[Pkg-owncloud-commits] [owncloud] 182/223: We obviously have to pass the hostname as is when there is no ':' in the hostname.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 9db0a82a2666c554b3bf51621985cfd8d3c2feb9
Author: Andreas Fischer <bantu at owncloud.com>
Date:   Tue Jun 17 14:44:57 2014 +0200

    We obviously have to pass the hostname as is when there is no ':' in the hostname.
    
    This reverts commit 73062040e68212ac6e92d36211ca0bef91777589.
---
 lib/private/db.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/db.php b/lib/private/db.php
index 8fd2ef1..6aaf31a 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -78,12 +78,12 @@ class OC_DB {
 				// Host variable may carry a port or socket.
 				list($host, $portOrSocket) = explode(':', $host, 2);
 				if (ctype_digit($portOrSocket)) {
-					$connectionParams['host'] = $host;
 					$connectionParams['port'] = $portOrSocket;
 				} else {
 					$connectionParams['unix_socket'] = $portOrSocket;
 				}
 			}
+			$connectionParams['host'] = $host;
 			$connectionParams['dbname'] = $name;
 		}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git