diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-21 15:39:14 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-21 15:39:14 -0800 |
| commit | cf739c0361cce7f1c454a0e52809fba99cb40e84 (patch) | |
| tree | ff75671dc4075cef1b35553680222fc166cdb401 /include/ItemObject.php | |
| parent | b224f8056cbf9b41994b44e48a7ad154976d1c88 (diff) | |
| parent | f17ef6aa90bc283e122a88e627cb464f065af2a6 (diff) | |
| download | volse-hubzilla-cf739c0361cce7f1c454a0e52809fba99cb40e84.tar.gz volse-hubzilla-cf739c0361cce7f1c454a0e52809fba99cb40e84.tar.bz2 volse-hubzilla-cf739c0361cce7f1c454a0e52809fba99cb40e84.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/ItemObject.php')
| -rw-r--r-- | include/ItemObject.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index f6f7c0fba..6037daa7a 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -88,7 +88,7 @@ class Item extends BaseObject { || strlen($item['deny_cid']) || strlen($item['deny_gid'])))) ? t('Private Message') : false); - $shareable = ((($conv->get_profile_owner() == local_user()) && ($item['item_private'] != 1)) ? true : false); + $shareable = ((($conv->get_profile_owner() == local_user() && local_user()) && ($item['item_private'] != 1)) ? true : false); // allow an exemption for sharing stuff from your private feeds if($item['author']['xchan_network'] === 'rss') @@ -288,7 +288,7 @@ class Item extends BaseObject { 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''), 'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''), 'filer' => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''), - 'bookmark' => (($conv->get_profile_owner() == local_user() && $has_bookmarks) ? t('Save Bookmarks') : ''), + 'bookmark' => (($conv->get_profile_owner() == local_user() && local_user() && $has_bookmarks) ? t('Save Bookmarks') : ''), 'addtocal' => (($has_event) ? t('Add to Calendar') : ''), 'drop' => $drop, 'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''), |