1
0
mirror of https://github.com/dg/dibi.git synced 2025-10-21 09:47:47 +02:00

remove operator @ in connect() methods

This commit is contained in:
David Grudl
2006-08-25 18:10:30 +00:00
parent 2cc9fa22fb
commit 36b88503f9
7 changed files with 42 additions and 25 deletions

View File

@@ -48,14 +48,15 @@ class DibiMySqlDriver extends DibiDriver {
if (!extension_loaded('mysql'))
return new DibiException("PHP extension 'mysql' is not loaded");
foreach (array('username', 'password', 'protocol') as $var)
if (!isset($config[$var])) $config[$var] = NULL;
if (empty($config['host'])) $config['host'] = 'localhost';
if (@$config['protocol'] === 'unix') // host can be socket
if ($config['protocol'] === 'unix') // host can be socket
$host = ':' . $config['host'];
else
$host = $config['host'] . (empty($config['port']) ? '' : $config['port']);
$host = $config['host'] . (empty($config['port']) ? '' : ':'.$config['port']);
// some errors aren't handled. Must use $php_errormsg
if (function_exists('ini_set'))
@@ -63,9 +64,9 @@ class DibiMySqlDriver extends DibiDriver {
$php_errormsg = '';
if (empty($config['persistent']))
$conn = @mysql_connect($host, @$config['username'], @$config['password']);
$conn = @mysql_connect($host, $config['username'], $config['password']);
else
$conn = @mysql_pconnect($host, @$config['username'], @$config['password']);
$conn = @mysql_pconnect($host, $config['username'], $config['password']);
if (function_exists('ini_set'))
ini_set('track_errors', $save);