composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	core/attributedef.class.inc.php
#	core/config.class.inc.php
#	core/htmlsanitizer.class.inc.php
#	sources/Renderer/RenderingOutput.php
#	test/core/sanitizer/HTMLDOMSanitizerTest.php
#	test/integration/DictionariesConsistencyTest.php
This commit is contained in:
Pierre Goiffon
2021-11-24 15:01:38 +01:00
parent 0c7eee7f9c 2d67594ccf
commit ddd6bf22af
14 changed files with 516 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/Renderer/RenderingOutput.php
View File

@@ -20,6 +20,8 @@
namespace Combodo\iTop\Renderer;
use utils;
/**
* Description of RenderingOutput
*
@@ -111,15 +113,15 @@ class RenderingOutput
/**
*
* @param string $sHtml
* @param bool $bEncodeHtmlEntities
* @param ?string $sHtml
* @param bool $bEscapeHtmlEntities
*
* @return \Combodo\iTop\Renderer\RenderingOutput
*/
public function AddHtml(?string $sHtml, bool $bEncodeHtmlEntities = false)
public function AddHtml(?string $sHtml, bool $bEscapeHtmlEntities = false)
{
if (!is_null($sHtml)) {
$this->sHtml .= ($bEncodeHtmlEntities) ? htmlentities($sHtml, ENT_QUOTES, 'UTF-8') : $sHtml;
$this->sHtml .= ($bEscapeHtmlEntities) ? utils::Escapehtml($sHtml) : $sHtml;
}
return $this;