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("'", "'",$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'].