diff options
| author | Matt Friedman <maf675@gmail.com> | 2013-10-29 19:12:32 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2013-10-29 19:12:32 -0700 |
| commit | 16213c92fe71cb1029bdac3b797529c6c74f6e96 (patch) | |
| tree | 2256b3b880d113b814cd8c8b42b415dd407f0ef1 /phpBB/phpbb/db/driver/postgres.php | |
| parent | 67beb97efec06c4a663c7eec8d54ab3194744f83 (diff) | |
| parent | 2f1cf0d287f416f1c3b388d5d3e68d897f226aaf (diff) | |
| download | forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.gz forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.bz2 forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.tar.xz forums-16213c92fe71cb1029bdac3b797529c6c74f6e96.zip | |
[ticket/11935] Merge remote-tracking branch 'upstream/develop'
PHPBB3-11935
Diffstat (limited to 'phpBB/phpbb/db/driver/postgres.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/postgres.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/db/driver/postgres.php b/phpBB/phpbb/db/driver/postgres.php index 9cbb1ecb07..5cd6578d87 100644 --- a/phpBB/phpbb/db/driver/postgres.php +++ b/phpBB/phpbb/db/driver/postgres.php @@ -328,7 +328,7 @@ class postgres extends \phpbb\db\driver\driver return false; } - $temp_result = @pg_fetch_assoc($temp_q_id, NULL); + $temp_result = @pg_fetch_assoc($temp_q_id, null); @pg_free_result($query_id); return ($temp_result) ? $temp_result['last_value'] : false; @@ -456,7 +456,7 @@ class postgres extends \phpbb\db\driver\driver if ($result = @pg_query($this->db_connect_id, "EXPLAIN $explain_query")) { - while ($row = @pg_fetch_assoc($result, NULL)) + while ($row = @pg_fetch_assoc($result, null)) { $html_table = $this->sql_report('add_select_row', $query, $html_table, $row); } @@ -476,7 +476,7 @@ class postgres extends \phpbb\db\driver\driver $endtime = $endtime[0] + $endtime[1]; $result = @pg_query($this->db_connect_id, $query); - while ($void = @pg_fetch_assoc($result, NULL)) + while ($void = @pg_fetch_assoc($result, null)) { // Take the time spent on parsing rows into account } |