Skip to content

[3.x] Backport Make sure the renderer does not manipulate the inline CSS and JS #28720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zero-24 wants to merge 3 commits into from
Closed

[3.x] Backport Make sure the renderer does not manipulate the inline CSS and JS #28720

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e51b54
backport https://github.com/joomla/joomla-cms/pull/28719 to 3.x
zero-24 Apr 18, 2020
73b7687
Merge branch 'staging' into backport_fix_style_script_renderer
zero-24 Jun 26, 2020
60ce9c8
Merge branch 'staging' into backport_fix_style_script_renderer
zero-24 Jan 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions libraries/src/Document/Renderer/Html/HeadRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,23 +223,23 @@ public function fetchHead($document)
$buffer .= ' type="' . $type . '"';
}

$buffer .= '>' . $lnEnd;
$buffer .= '>';

// This is for full XHTML support.
if ($document->_mime != 'text/html')
{
$buffer .= $tab . $tab . '/*<![CDATA[*/' . $lnEnd;
}

$buffer .= $content . $lnEnd;
$buffer .= $content;

// See above note
if ($document->_mime != 'text/html')
{
$buffer .= $tab . $tab . '/*]]>*/' . $lnEnd;
}

$buffer .= $tab . '</style>' . $lnEnd;
$buffer .= '</style>' . $lnEnd;
}

// Generate scripts options
Expand Down Expand Up @@ -348,23 +348,23 @@ public function fetchHead($document)
$buffer .= ' type="' . $type . '"';
}

$buffer .= '>' . $lnEnd;
$buffer .= '>';

// This is for full XHTML support.
if ($document->_mime != 'text/html')
{
$buffer .= $tab . $tab . '//<![CDATA[' . $lnEnd;
}

$buffer .= $content . $lnEnd;
$buffer .= $content;

// See above note
if ($document->_mime != 'text/html')
{
$buffer .= $tab . $tab . '//]]>' . $lnEnd;
}

$buffer .= $tab . '</script>' . $lnEnd;
$buffer .= '</script>' . $lnEnd;
}

// Output the custom tags - array_unique makes sure that we don't output the same tags twice
Expand Down