maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

dont access db result arrays directly without checking whether it's false due to an error (php7.4 related)

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-01-19 10:13:28 +01:00
parent e44e07784f
commit 2004bbe38d
11 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Api/ApiCommand.php
View File

@@ -583,8 +583,12 @@ abstract class ApiCommand extends ApiParameter
"group" => $group,
"var" => $varname
), true, true);
$content = $default;
if ($result) {
$content = $result['value'] ?? $default;
}
// @fixme html_entity_decode
$content = html_entity_decode(\Froxlor\PhpHelper::replaceVariables((($result['value'] != '') ? $result['value'] : $default), $replace_arr));
$content = html_entity_decode(\Froxlor\PhpHelper::replaceVariables($content, $replace_arr));
return $content;
}