diff options
| author | friendica <info@friendica.com> | 2014-09-02 17:21:12 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-02 17:21:12 -0700 |
| commit | 2c94d59cba0b3231b0dd822fc1b95bed5521c48d (patch) | |
| tree | 5000d4070a1810c1c4b538bf0970d867f0bb6ddb /mod/share.php | |
| parent | 17c1ddb77e153b72fd70d3b58befb9e791ca04c7 (diff) | |
| download | volse-hubzilla-2c94d59cba0b3231b0dd822fc1b95bed5521c48d.tar.gz volse-hubzilla-2c94d59cba0b3231b0dd822fc1b95bed5521c48d.tar.bz2 volse-hubzilla-2c94d59cba0b3231b0dd822fc1b95bed5521c48d.zip | |
use feed title for channel name before checking author, make feed items shareable (they're private to the channel so they won't be shown in searches), try and handle Diaspora mentions a bit more elegantly. (Bug: we don't convert mentions to Diaspora's format on outbound at all!)
Diffstat (limited to 'mod/share.php')
| -rw-r--r-- | mod/share.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/share.php b/mod/share.php index 8b0403663..78a25ee10 100644 --- a/mod/share.php +++ b/mod/share.php @@ -14,10 +14,12 @@ function share_init(&$a) { killme(); - $r = q("SELECT * from item WHERE id = %d LIMIT 1", + $r = q("SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1", intval($post_id) ); - if((! $r) || $r[0]['item_private']) + if(! $r) + killme(); + if(($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) killme(); $sql_extra = item_permissions_sql($r[0]['uid']); |