mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 20:40:24 +02:00
Code Issues Releases Wiki Activity

[ticket/10057] Use a class for error collection.

Browse Source 
Replaced error collection functions with a class for a cleaner
implementation.

PHPBB3-10057
This commit is contained in:
Oleg Pudeyev
2011-03-02 06:35:25 -05:00
parent a4100fe709
commit 17693c2802
2 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/db/postgres.php
View File

@@ -85,7 +85,8 @@ class dbal_postgres extends dbal
{
return $this->sql_error('pg_pconnect function does not exist, is pgsql extension installed?');
}
phpbb_start_error_collection();
$collector = new phpbb_error_collector;
$collector->install();
$this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
}
else
@@ -94,11 +95,12 @@ class dbal_postgres extends dbal
{
return $this->sql_error('pg_connect function does not exist, is pgsql extension installed?');
}
phpbb_start_error_collection();
$collector = new phpbb_error_collector;
$collector->install();
$this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
}
$errors = phpbb_stop_error_collection();
$collector->uninstall();
if ($this->db_connect_id)
{
@@ -114,7 +116,7 @@ class dbal_postgres extends dbal
return $this->db_connect_id;
}
$errors = phpbb_format_collected_errors($errors);
$errors = $collector->format_errors();
return $this->sql_error($errors);
}