diff options
| -rw-r--r-- | done | 2 | ||||
| -rw-r--r-- | mod/item.php | 2 | ||||
| -rw-r--r-- | mod/share.php | 15 |
3 files changed, 9 insertions, 10 deletions
@@ -159,7 +159,7 @@ mod/ search_ac.php search.php settings.php - share.php ++ share.php + smilies.php + starred.php subthread.php diff --git a/mod/item.php b/mod/item.php index 94d11f4d6..c845ca57e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -938,7 +938,7 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body, $images = $match[1]; if($images) { foreach($images as $image) { - if(! stristr($image,$a->get_baseurl() . '/photo/')) + if(! stristr($image,get_app()->get_baseurl() . '/photo/')) continue; $image_uri = substr($image,strrpos($image,'/') + 1); $image_uri = substr($image_uri,0, strpos($image_uri,'-')); diff --git a/mod/share.php b/mod/share.php index 8d9cd16ea..33aa9eede 100644 --- a/mod/share.php +++ b/mod/share.php @@ -4,23 +4,22 @@ require_once('bbcode.php'); function share_init(&$a) { - $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); + $post_id = ((argc() > 1) ? intval(argv(1)) : 0); if((! $post_id) || (! local_user())) killme(); - $r = q("SELECT item.*, contact.network FROM `item` - left join contact on `item`.`contact-id` = `contact`.`id` - WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1", - + $r = q("SELECT * from item WHERE id = %d AND uid = %d and item_restrict = 0 LIMIT 1", intval($post_id), intval(local_user()) ); - if(! count($r) || ($r[0]['private'] == 1)) + if((! $r) || $r[0]['item_private']) killme(); - $o = '[share]'; + xchan_query($r); + + $o = '[share]' . "\n"; - $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n"; + $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author']['xchan_url'] . ']' . $r[0]['author']['xchan_name'] . '[/url]' . "\n"; if($r[0]['title']) $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n"; $o .= $r[0]['body'] . "\n" ; |