Skip to content

Commit

Permalink
fixed bug 4474 to silence calls to htmlentities and htmlspecialchars so
Browse files Browse the repository at this point in the history
that errors about charsets don't pop up, per counsel from Jan at Horde.


git-svn-id: https://svn.php.net/repository/pear/packages/Text_Wiki/trunk@187320 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information
Paul M Jones committed May 30, 2005
1 parent 4449731 commit d980567
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions Text/Wiki/Render/Xhtml.php
Expand Up @@ -23,8 +23,10 @@ function pre()
// so we can convert it back.
$new_delim = htmlentities($this->wiki->delim, $quotes, $charset);

// convert the entities
$this->wiki->source = htmlentities(
// convert the entities. we silence the call here so that
// errors about charsets don't pop up, per counsel from
// Jan at Horde. (http://pear.php.net/bugs/bug.php?id=4474)
$this->wiki->source = @htmlentities(
$this->wiki->source,
$quotes,
$charset
Expand All @@ -42,8 +44,10 @@ function pre()
$new_delim = htmlspecialchars($this->wiki->delim, $quotes,
$charset);

// convert the special chars
$this->wiki->source = htmlspecialchars(
// convert the entities. we silence the call here so that
// errors about charsets don't pop up, per counsel from
// Jan at Horde. (http://pear.php.net/bugs/bug.php?id=4474)
$this->wiki->source = @htmlspecialchars(
$this->wiki->source,
$quotes,
$charset
Expand Down

0 comments on commit d980567

Please sign in to comment.