aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-06 05:25:10 -0700
committerfriendica <info@friendica.com>2013-09-06 05:25:10 -0700
commitd194ee091af0ee15c7f63def7e8c07ee29e38f39 (patch)
tree0de3769e20468202520959d4a0a7e2e33cdb40c6 /include
parentf2f3372aa9fd6ce5e121f52359bc4a05a79592d1 (diff)
downloadvolse-hubzilla-d194ee091af0ee15c7f63def7e8c07ee29e38f39.tar.gz
volse-hubzilla-d194ee091af0ee15c7f63def7e8c07ee29e38f39.tar.bz2
volse-hubzilla-d194ee091af0ee15c7f63def7e8c07ee29e38f39.zip
encode and decode channel names containing HTML special characters and quotes so they will survive a reshare without mangling
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php22
1 files changed, 1 insertions, 21 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 4647b8567..997cbac2e 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -106,48 +106,28 @@ function bb_ShareAttributes($match) {
$author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
- $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
-
- preg_match('/author="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $author = $matches[1];
+ $author = urldecode($matches[1]);
$link = "";
preg_match("/link='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$link = $matches[1];
- preg_match('/link="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $link = $matches[1];
-
$avatar = "";
preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$avatar = $matches[1];
- preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $avatar = $matches[1];
-
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$profile = $matches[1];
- preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $profile = $matches[1];
-
$posted = "";
preg_match("/posted='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "")
$posted = $matches[1];
- preg_match('/posted="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "")
- $posted = $matches[1];
-
// FIXME - this should really be a wall-item-ago so it will get updated on the client
$reldate = (($posted) ? relative_date($posted) : '');