mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/16883] Check if var is array before using count()

Browse Source 
PHPBB3-16883
This commit is contained in:
Marc Alexander
2021-10-05 21:07:50 +02:00
parent 9a7d88362f
commit e5fa23c3c0
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/diff/diff.php
View File

@@ -168,8 +168,14 @@ class diff
$final = $edit->final; $final = $edit->final;
// We can simplify one case where the array is usually supposed to be empty... // We can simplify one case where the array is usually supposed to be empty...
if (count($orig) == 1 && trim($orig[0]) === '') $orig = array(); if (is_array($orig) && count($orig) == 1 && trim($orig[0]) === '')
if (count($final) == 1 && trim($final[0]) === '') $final = array(); {
$orig = array();
}
if (is_array($final) && count($final) == 1 && trim($final[0]) === '')
{
$final = array();
}
if (!$orig && !$final) if (!$orig && !$final)
{ {