makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages 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( $error = array(
'message' => @mssql_get_last_message(), 'message' => @mssql_get_last_message(),
'code' => '' 'code' => '',
); );
// Get error code number // 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( return array(
'message' => @odbc_errormsg(), 'message' => @odbc_errormsg(),
'code' => @odbc_error() 'code' => @odbc_error(),
); );
} }
else else

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

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

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

@ -443,7 +443,7 @@ class dbal_mysql extends dbal
{ {
return array( return array(
'message' => @mysql_error(), 'message' => @mysql_error(),
'code' => @mysql_errno() 'code' => @mysql_errno(),
); );
} }
else else
@ -457,7 +457,7 @@ class dbal_mysql extends dbal
return array( return array(
'message' => @mysql_error($this->db_connect_id), '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( return array(
'message' => @sqlite_error_string(@sqlite_last_error($this->db_connect_id)), '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 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']); $db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']);
$this->assertFalse(true); $this->assertFalse(true);
} catch (Exception $e) }
catch (Exception $e)
{ {
// should have a legitimate message // should have a legitimate message
$this->assertNotEmpty($e->getMessage()); $this->assertNotEmpty($e->getMessage());