diff options
| author | Florian Pritz <bluewind@xinu.at> | 2022-04-10 11:46:21 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2022-04-10 11:46:21 +0200 |
| commit | b401c4e13863143b38b8848595566801fcc1527f (patch) | |
| tree | c6eae5ce18f519480ead73a16029dbf3c8e993aa /system/libraries/Profiler.php | |
| parent | 3deea564901d69109ddd6f757ccff84e6f113997 (diff) | |
| parent | 45576ef6e62b5ff59da67f1697ee8c57809c7719 (diff) | |
Merge remote-tracking branch 'upstream/3.1-stable' into dev
Diffstat (limited to 'system/libraries/Profiler.php')
| -rw-r--r-- | system/libraries/Profiler.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php index 5531f3366..d423c1481 100644 --- a/system/libraries/Profiler.php +++ b/system/libraries/Profiler.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2019, British Columbia Institute of Technology + * Copyright (c) 2019 - 2022, CodeIgniter Foundation * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -30,6 +30,7 @@ * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) * @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/) + * @copyright Copyright (c) 2019 - 2022, CodeIgniter Foundation (https://codeigniter.com/) * @license https://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 1.0.0 @@ -496,7 +497,7 @@ class CI_Profiler { } $output .= '<tr><td style="padding:5px;vertical-align:top;color:#900;background-color:#ddd;">' - .$config.' </td><td style="padding:5px;color:#000;background-color:#ddd;">'.$pre.htmlspecialchars($val, ENT_QUOTES, config_item('charset')).$pre_close."</td></tr>\n"; + .$config.' </td><td style="padding:5px;color:#000;background-color:#ddd;">'.$pre.htmlspecialchars((string) $val, ENT_QUOTES, config_item('charset')).$pre_close."</td></tr>\n"; } return $output."</table>\n</fieldset>"; @@ -534,7 +535,7 @@ class CI_Profiler { } $output .= '<tr><td style="padding:5px;vertical-align:top;color:#900;background-color:#ddd;">' - .$key.' </td><td style="padding:5px;color:#000;background-color:#ddd;">'.$pre.htmlspecialchars($val, ENT_QUOTES, config_item('charset')).$pre_close."</td></tr>\n"; + .$key.' </td><td style="padding:5px;color:#000;background-color:#ddd;">'.$pre.htmlspecialchars((string) $val, ENT_QUOTES, config_item('charset')).$pre_close."</td></tr>\n"; } return $output."</table>\n</fieldset>"; |