mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-20 15:53:14 +02:00
Code Issues Releases Wiki Activity

[ticket/10205] Cosmetic changes.

Browse Source 
PHPBB3-10205
This commit is contained in:
Oleg Pudeyev 2012-12-04 21:22:33 -05:00
parent 29c4da6162
commit 89c9c9d4b0
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/db/mssql.php
View File

@ -367,7 +367,7 @@ class dbal_mssql extends dbal
{
$error = array(
'message' => @mssql_get_last_message(),
'code' => ''
'code' => '',
);
// Get error code number

2
phpBB/includes/db/mssql_odbc.php
View File

@ -364,7 +364,7 @@ class dbal_mssql_odbc extends dbal
{
return array(
'message' => @odbc_errormsg(),
'code' => @odbc_error()
'code' => @odbc_error(),
);
}
else

6
phpBB/includes/db/mssqlnative.php
View File

@ -526,10 +526,10 @@ class dbal_mssqlnative extends dbal
{
foreach ($errors as $error)
{
$error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
$error_message .= "code: ".$error[ 'code']."\n";
$error_message .= "SQLSTATE: " . $error[ 'SQLSTATE'] . "\n";
$error_message .= "code: " . $error[ 'code'] . "\n";
$code = $error['code'];
$error_message .= "message: ".$error[ 'message']."\n";
$error_message .= "message: " . $error[ 'message'] . "\n";
}
$this->last_error_result = $error_message;
$error = $this->last_error_result;

4
phpBB/includes/db/mysql.php
View File

@ -443,7 +443,7 @@ class dbal_mysql extends dbal
{
return array(
'message' => @mysql_error(),
'code' => @mysql_errno()
'code' => @mysql_errno(),
);
}
else
@ -457,7 +457,7 @@ class dbal_mysql extends dbal
return array(
'message' => @mysql_error($this->db_connect_id),
'code' => @mysql_errno($this->db_connect_id)
'code' => @mysql_errno($this->db_connect_id),
);
}

2
phpBB/includes/db/sqlite.php
View File

@ -304,7 +304,7 @@ class dbal_sqlite extends dbal
{
return array(
'message' => @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
'code' => @sqlite_last_error($this->db_connect_id)
'code' => @sqlite_last_error($this->db_connect_id),
);
}
else

3
tests/dbal/connect_test.php
View File

@ -33,7 +33,8 @@ class phpbb_dbal_connect_test extends phpbb_database_test_case
{
$db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']);
$this->assertFalse(true);
} catch (Exception $e)
}
catch (Exception $e)
{
// should have a legitimate message
$this->assertNotEmpty($e->getMessage());