aboutsummaryrefslogtreecommitdiffstats
path: root/mod
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 /mod
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 'mod')
-rw-r--r--mod/display.php6
-rw-r--r--mod/share.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/mod/display.php b/mod/display.php
index 110dd1807..63b5fa29b 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -19,7 +19,6 @@ function display_content(&$a, $update = 0, $load = false) {
$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
-
if(argc() > 1 && argv(1) !== 'load')
$item_hash = argv(1);
@@ -91,7 +90,6 @@ function display_content(&$a, $update = 0, $load = false) {
$sql_extra = public_permissions_sql(get_observer_hash());
-
if($update && $load) {
$updateable = false;
@@ -109,8 +107,10 @@ function display_content(&$a, $update = 0, $load = false) {
intval(local_user()),
dbesc($target_item['parent_mid'])
);
- if($r)
+ if($r) {
$updateable = true;
+
+ }
}
if($r === null) {
$r = q("SELECT * from item
diff --git a/mod/share.php b/mod/share.php
index f0b14541f..1f767578d 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -21,7 +21,7 @@ function share_init(&$a) {
$pos = strpos($r[0]['body'], "[share");
$o = substr($r[0]['body'], $pos);
} else {
- $o = "[share author='".str_replace("'", "&#039;",$r[0]['author']['xchan_name']).
+ $o = "[share author='".urlencode($r[0]['author']['xchan_name']).
"' profile='".$r[0]['author']['xchan_url'] .
"' avatar='".$r[0]['author']['xchan_photo_s'].
"' link='".$r[0]['plink'].