Commit cfa8ae91 authored by Oliver Hader's avatar Oliver Hader
Browse files

Fixed bug #15289: Element-Browser page tree has HSC'ed <span> elements


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-1@8466 709f56b5-9817-0410-a4d7-c38de5d9e867
parent b3cab2fa
2010-08-02 Oliver Hader <oliver@typo3.org>
* Fixed bug #15289: Element-Browser page tree has HSC'ed <span> elements
2010-07-30 Oliver Hader <oliver@typo3.org>
* Reverted fix for bug #15260
......
......@@ -162,7 +162,7 @@ class t3lib_browseTree extends t3lib_treeView {
$rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('domainName,sorting', 'sys_domain',
'pid=' . $GLOBALS['TYPO3_DB']->quoteStr($row['uid'], 'sys_domain'), '', 'sorting', 1);
if (is_array($rows) && count($rows) > 0) {
$title = sprintf('%s [%s]', $title, $rows[0]['domainName']);
$title = sprintf('%s [%s]', $title, htmlspecialchars($rows[0]['domainName']));
}
}
return $title;
......
......@@ -435,8 +435,6 @@ class TBE_PageTree extends localPageTree {
* @return string Wrapping title string.
*/
function wrapTitle($title,$v,$ext_pArrPages) {
$title = htmlspecialchars($title);
if ($ext_pArrPages) {
$ficon=t3lib_iconWorks::getIcon('pages',$v);
$onClick = "return insertElement('pages', '".$v['uid']."', 'db', ".t3lib_div::quoteJSvalue($v['title']).", '', '', '".$ficon."','',1);";
......@@ -484,8 +482,6 @@ class localFolderTree extends t3lib_folderTree {
* @return string Wrapping title string.
*/
function wrapTitle($title,$v) {
$title = htmlspecialchars($title);
if ($this->ext_isLinkable($v)) {
$aOnClick = 'return jumpToUrl(\''.$this->thisScript.'?act='.$GLOBALS['SOBE']->browser->act.'&mode='.$GLOBALS['SOBE']->browser->mode.'&expandFolder='.rawurlencode($v['path']).'\');';
return '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$title.'</a>';
......@@ -569,7 +565,7 @@ class localFolderTree extends t3lib_folderTree {
// Put table row with folder together:
$out.='
<tr class="'.$bgColorClass.'">
<td nowrap="nowrap">'.$v['HTML'].$this->wrapTitle(t3lib_div::fixed_lgd_cs($v['row']['title'],$titleLen),$v['row']).'</td>
<td nowrap="nowrap">' . $v['HTML'] . $this->wrapTitle(htmlspecialchars(t3lib_div::fixed_lgd_cs($v['row']['title'], $titleLen)), $v['row']) . '</td>
'.$arrCol.'
<td>'.$cEbullet.'</td>
</tr>';
......@@ -638,8 +634,6 @@ class TBE_FolderTree extends localFolderTree {
* @return string Wrapping title string.
*/
function wrapTitle($title,$v) {
$title = htmlspecialchars($title);
if ($this->ext_isLinkable($v)) {
$aOnClick = 'return jumpToUrl(\''.$this->thisScript.'?act='.$GLOBALS['SOBE']->browser->act.'&mode='.$GLOBALS['SOBE']->browser->mode.'&expandFolder='.rawurlencode($v['path']).'\');';
return '<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.$title.'</a>';
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment