diff --git a/dibi/dibi.php b/dibi/dibi.php index 98899e9a..a1a74e00 100644 --- a/dibi/dibi.php +++ b/dibi/dibi.php @@ -778,15 +778,19 @@ class dibi /** * Returns brief descriptions. + * @return string * @return array */ - public static function getColophon() + public static function getColophon($sender = NULL) { - return array( - 'dibi version: ' . dibi::VERSION, - 'Number or queries: ' . dibi::$numOfQueries - . (dibi::$totalTime === NULL ? '' : ' (elapsed time: ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms)'), + $arr = array( + 'Number of SQL queries: ' . dibi::$numOfQueries + . (dibi::$totalTime === NULL ? '' : ', elapsed time: ' . sprintf('%0.3f', dibi::$totalTime * 1000) . ' ms'), ); + if ($sender === 'bluescreen') { + $arr[] = 'dibi version ' . dibi::VERSION; + } + return $arr; } } diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php index f5194be0..63fe73ca 100644 --- a/dibi/drivers/mssql.php +++ b/dibi/drivers/mssql.php @@ -74,7 +74,7 @@ class DibiMsSqlDriver extends /*Nette::*/Object implements IDibiDriver { DibiConnection::alias($config, 'username', 'user'); DibiConnection::alias($config, 'password', 'pass'); - DibiConnection::alias($config, 'host'); + DibiConnection::alias($config, 'host', 'hostname'); if (empty($config['persistent'])) { $this->connection = @mssql_connect($config['host'], $config['username'], $config['password'], TRUE); // intentionally @ diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php index 0490e5b9..d87112ee 100644 --- a/dibi/drivers/mysql.php +++ b/dibi/drivers/mysql.php @@ -87,6 +87,7 @@ class DibiMySqlDriver extends /*Nette::*/Object implements IDibiDriver { DibiConnection::alias($config, 'username', 'user'); DibiConnection::alias($config, 'password', 'pass'); + DibiConnection::alias($config, 'host', 'hostname'); DibiConnection::alias($config, 'options'); // default values diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php index 00b397cd..8991f3de 100644 --- a/dibi/drivers/mysqli.php +++ b/dibi/drivers/mysqli.php @@ -87,6 +87,7 @@ class DibiMySqliDriver extends /*Nette::*/Object implements IDibiDriver { DibiConnection::alias($config, 'username', 'user'); DibiConnection::alias($config, 'password', 'pass'); + DibiConnection::alias($config, 'host', 'hostname'); DibiConnection::alias($config, 'options'); DibiConnection::alias($config, 'database'); diff --git a/examples/nette-debug.php b/examples/nette-debug.php index 5489b783..ae73c5c9 100644 --- a/examples/nette-debug.php +++ b/examples/nette-debug.php @@ -1,11 +1,11 @@

Nette::Debug && dibi example