Fixing DboSybase::connect() to use port configuration value. Thanks '…

…tPl0ch' for the various attempts :) Fixes #90
cakephp · Sep 30, 2009 · dc220bb · dc220bb
1 parent 508d737
commit dc220bb
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/cake/libs/model/datasources/dbo/dbo_sybase.php b/cake/libs/model/datasources/dbo/dbo_sybase.php
@@ -89,17 +89,17 @@ class DboSybase extends DboSource {
  */
 	function connect() {
 		$config = $this->config;
-		$this->connected = false;
 
-		if (!$config['persistent']) {
-			$this->connection = sybase_connect($config['host'], $config['login'], $config['password'], true);
-		} else {
-			$this->connection = sybase_pconnect($config['host'], $config['login'], $config['password']);
+		$port = '';
+		if ($config['port'] !== null) {
+			$port = ':' . $config['port'];
 		}
-
-		if (sybase_select_db($config['database'], $this->connection)) {
-			$this->connected = true;
+		if ($config['persistent']) {
+			$this->connection = sybase_connect($config['host'] . $port, $config['login'], $config['password'], true);
+		} else {
+			$this->connection = sybase_pconnect($config['host'] . $port, $config['login'], $config['password']);
 		}
+		$this->connected = sybase_select_db($config['database'], $this->connection);
 		return $this->connected;
 	}
 /**