summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian A. Weber2018-04-17 12:55:22 +0200
committerChristian A. Weber2018-04-17 12:55:22 +0200
commit89d02c90e8fe422cad65b7ff03960f58e5b4a8f1 (patch)
tree7fc43a7923a927509030d3ca590301631d0cfbca
parentc7fecb80537e499fd135736d3eaf121241a973cd (diff)
downloaditools-89d02c90e8fe422cad65b7ff03960f58e5b4a8f1.tar.gz
itools-89d02c90e8fe422cad65b7ff03960f58e5b4a8f1.tar.bz2
itools-89d02c90e8fe422cad65b7ff03960f58e5b4a8f1.zip
first amendment of last commit
-rw-r--r--it_html.class4
1 files changed, 1 insertions, 3 deletions
diff --git a/it_html.class b/it_html.class
index 03a46ea..abd674f 100644
--- a/it_html.class
+++ b/it_html.class
@@ -77,7 +77,6 @@ function __construct($p = array())
'moretags' => '', # Comma-separated list of tag-functions to generate additionally to 'tags'
'name' => 'it_html', # Name of global variable $this is assigned to (string), XXX Copy and paste in configure() to keep PHP4 compatibility
'nonewlinetags' => 'a,b,em,img,input,label,span,noscript', # tags that do not like newlines after them
- 'alwaysclosetags' => 'a,button,div,iframe,pre,script,span,tbody,td,tfoot,thead,textarea,ul,ol', # tags which always get a close tag
'prettyprint' => it::is_devel(), # Should output be prettily indented?
'show_boot_dom' => false, # If true, append invisible <div id="it_boot_dom"> at the end of body
'show_content_type' => true, # If true, add <meta http-equiv="Content-Type" ...> header
@@ -141,7 +140,6 @@ static function configure($p)
$ithtml->p = $p + (array)$ithtml->p;
$ithtml->alltags = array_flip(explode(',', trim($ithtml->p['tags'] . ',' . $ithtml->p['moretags'], ',')));
$ithtml->hasnonewline = array_flip(explode(',', $ithtml->p['nonewlinetags']));
- $ithtml->alwaysclose = array_flip(explode(',', $ithtml->p['alwaysclosetags']));
}
/**
@@ -319,7 +317,7 @@ function _tag($name, $args)
# close tag according to html dialect
if ($this->p['htmltype'][0] == 'x') # xhtml
- $result .= isset($data) || isset($this->alwaysclose[$name]) ? ">$data</$name>$newline" : " />$newline";
+ $result .= isset($data) ? ">$data</$name>$newline" : " />$newline";
else
$result .= isset($data) || !self::$voidtags[$name] ? ">$data</$name>$newline" : ">$newline";