diff options
author | zzottel <github@zottel.net> | 2013-12-12 04:34:34 -0800 |
---|---|---|
committer | zzottel <github@zottel.net> | 2013-12-12 04:34:34 -0800 |
commit | 81cf9209f029bbed00a0eaf91fc672984763c5e4 (patch) | |
tree | d5231730ba3fe285586a2035dcd35b995e3d0471 /include | |
parent | 303324cdff3f7c8bc83fae89256a2133939944b2 (diff) | |
parent | 3a11980e495fc42c9fbf178480d16380f6cca69a (diff) | |
download | volse-hubzilla-81cf9209f029bbed00a0eaf91fc672984763c5e4.tar.gz volse-hubzilla-81cf9209f029bbed00a0eaf91fc672984763c5e4.tar.bz2 volse-hubzilla-81cf9209f029bbed00a0eaf91fc672984763c5e4.zip |
Merge pull request #241 from zzottel/master
htmspecialchars_decode only takes one argument.
Diffstat (limited to 'include')
-rw-r--r-- | include/network.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/network.php b/include/network.php index 225b215fe..7446c2384 100644 --- a/include/network.php +++ b/include/network.php @@ -582,7 +582,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) $a = get_app(); // Picture addresses can contain special characters - $s = htmlspecialchars_decode($s, ENT_COMPAT,'UTF-8'); + $s = htmlspecialchars_decode($s, ENT_COMPAT); $matches = null; $c = preg_match_all('/\[img(.*?)\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER); |