includes/wikiengine/Render/Xhtml.php
changeset 78 4df25dfdde63
parent 1 fe660c52c48f
equal deleted inserted replaced
77:63ca29eda873 78:4df25dfdde63
    59         $quotes = $this->getConf('quotes', ENT_COMPAT);
    59         $quotes = $this->getConf('quotes', ENT_COMPAT);
    60         $charset = $this->getConf('charset', 'ISO-8859-1');
    60         $charset = $this->getConf('charset', 'ISO-8859-1');
    61 
    61 
    62         // have to check null and false because HTML_ENTITIES is a zero
    62         // have to check null and false because HTML_ENTITIES is a zero
    63         if ($type === HTML_ENTITIES) {
    63         if ($type === HTML_ENTITIES) {
       
    64           /*
    64 
    65 
    65             // keep a copy of the translated version of the delimiter
    66             // keep a copy of the translated version of the delimiter
    66             // so we can convert it back.
    67             // so we can convert it back.
    67             $new_delim = htmlentities($this->wiki->delim, $quotes, $charset);
    68             $new_delim = htmlentities($this->wiki->delim, $quotes, $charset);
    68       
    69             
    69             // convert the entities.  we silence the call here so that
    70             // convert the entities.  we silence the call here so that
    70             // errors about charsets don't pop up, per counsel from
    71             // errors about charsets don't pop up, per counsel from
    71             // Jan at Horde.  (http://pear.php.net/bugs/bug.php?id=4474)
    72             // Jan at Horde.  (http://pear.php.net/bugs/bug.php?id=4474)
    72             $text = @htmlentities(
    73             $text = @htmlentities(
    73               $text,
    74               $text,
    82             
    83             
    83             // re-convert the delimiter
    84             // re-convert the delimiter
    84             $text = str_replace(
    85             $text = str_replace(
    85               $new_delim, $this->wiki->delim, $text
    86               $new_delim, $this->wiki->delim, $text
    86             );
    87             );
       
    88           */
    87 
    89 
    88         } elseif ($type === HTML_SPECIALCHARS) {
    90         } elseif ($type === HTML_SPECIALCHARS) {
    89     
    91     
    90           // keep a copy of the translated version of the delimiter
    92           // keep a copy of the translated version of the delimiter
    91           // so we can convert it back.
    93           // so we can convert it back.