Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-01-22 21:22:45 +01:00
commit e31c05f065
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -1037,12 +1037,6 @@ abstract class driver implements driver_interface
function sql_report($mode, $query = '') function sql_report($mode, $query = '')
{ {
global $cache, $starttime, $phpbb_root_path, $phpbb_path_helper; global $cache, $starttime, $phpbb_root_path, $phpbb_path_helper;
global $request;
if (is_object($request) && !$request->variable('explain', false))
{
return false;
}
if (!$query && $this->query_hold != '') if (!$query && $this->query_hold != '')
{ {