extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-30 20:04:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved control of excess empty div tags

Browse Source
This commit is contained in:
Klaus Leithoff 2012-11-15 15:31:02 +00:00
parent f286c0228e
commit 66a4b635e5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.egw_htmLawed.inc.php
View File

@ -202,6 +202,7 @@ function hl_email_tag_transform($element, $attribute_array=0)
{ {
static $lastelement; static $lastelement;
static $throwawaycounter; static $throwawaycounter;
if (is_null($lastelement)) $lastelement='';
if (is_null($throwawaycounter)) $throwawaycounter = 0; if (is_null($throwawaycounter)) $throwawaycounter = 0;
//if ($throwawaycounter>250) error_log(__METHOD__.__LINE__.' '.$throwawaycounter); //if ($throwawaycounter>250) error_log(__METHOD__.__LINE__.' '.$throwawaycounter);
if ($element=='div' && $element==$lastelement && ($attribute_array==0 || empty($attribute_array))) if ($element=='div' && $element==$lastelement && ($attribute_array==0 || empty($attribute_array)))
@ -210,16 +211,18 @@ function hl_email_tag_transform($element, $attribute_array=0)
if ($attribute_array==0 && $throwawaycounter>0) $throwawaycounter--; if ($attribute_array==0 && $throwawaycounter>0) $throwawaycounter--;
if ($throwawaycounter>0) return ''; if ($throwawaycounter>0) return '';
} }
if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array)) $throwawaycounter = 0;
if (is_array($attribute_array) && !empty($attribute_array) && $element=='div') if (is_array($attribute_array) && !empty($attribute_array) && $element=='div')
{ {
$lastelement = 'div_with_attr'; $lastelement = 'div_with_attr';
} }
else else
{ {
$lastelement = $element; if (is_array($attribute_array)) $lastelement = $element;
} }
// If second argument is not received, it means a closing tag is being handled // If second argument is not received, it means a closing tag is being handled
if(is_numeric($attribute_array)){ if(is_numeric($attribute_array)){
if($element==$lastelement) $lastelement='';
return "</$element>"; return "</$element>";
} }