mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00
Code Issues Releases Wiki Activity

[ticket/17142] Fix DBMS+cache related PHP warnings while installing

Browse Source 
PHPBB3-17142
This commit is contained in:
rxu
2023-06-08 00:05:48 +07:00
parent 75dcbeaa9f
commit 7adee3c50d
10 changed files with 115 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/phpbb/db/driver/postgres.php
View File

@@ -547,25 +547,4 @@ class postgres extends \phpbb\db\driver\driver
{
return '"' . $msg . '"';
}
/**
* Ensure query ID can be used by cache
*
* @param resource|int|string $query_id Mixed type query id
*
* @return int|string Query id in string or integer format
*/
private function clean_query_id($query_id)
{
// As of PHP 8.1 PgSQL functions accept/return \PgSQL\* objects instead of "pgsql *" resources
// Attempting to cast object to int will throw error, hence correctly handle all cases
if (is_resource($query_id))
{
return function_exists('get_resource_id') ? get_resource_id($query_id) : (int) $query_id;
}
else
{
return is_object($query_id) ? spl_object_id($query_id) : $query_id;
}
}
}