diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-12-07 15:17:27 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-12-07 15:17:27 +0000 |
| commit | 3342593eac2440bbf70fa06a484b273d8e5e075e (patch) | |
| tree | 51d0ee91fa1357ddf86eb6873f370171d0ba9ced /includes/database.pgsql.inc | |
| parent | 3cb401bda18f6f026b510ed3901ea7042e59c84e (diff) | |
| download | brdo-3342593eac2440bbf70fa06a484b273d8e5e075e.tar.gz brdo-3342593eac2440bbf70fa06a484b273d8e5e075e.tar.bz2 | |
- Patch #38889 by rkerr: db_error and db_affected_rows did not work properly in presence of multiple database connections.
Diffstat (limited to 'includes/database.pgsql.inc')
| -rw-r--r-- | includes/database.pgsql.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc index 28d5efd7a..89e6b9d7b 100644 --- a/includes/database.pgsql.inc +++ b/includes/database.pgsql.inc @@ -85,14 +85,14 @@ function _db_query($query, $debug = 0) { } if ($debug) { - print '<p>query: '. $query .'<br />error:'. pg_last_error() .'</p>'; + print '<p>query: '. $query .'<br />error:'. pg_last_error($active_db) .'</p>'; } if ($last_result !== FALSE) { return $last_result; } else { - trigger_error(check_plain(pg_last_error() ."\nquery: ". $query), E_USER_WARNING); + trigger_error(check_plain(pg_last_error($active_db) ."\nquery: ". $query), E_USER_WARNING); return FALSE; } } @@ -167,7 +167,8 @@ function db_result($result, $row = 0) { * Determine whether the previous query caused an error. */ function db_error() { - return pg_last_error(); + global $active_db; + return pg_last_error($active_db); } /** |