diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-25 08:44:07 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2014-09-25 08:44:07 +0200 |
| commit | 6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1 (patch) | |
| tree | 89e81409add34df97f633515181790d6aed4c726 /include/ItemObject.php | |
| parent | 7da97c198182f8f6f4286e16d80de205431d81bb (diff) | |
| parent | 92c723d37cd8ded2183d3334eb51e740170e191b (diff) | |
| download | volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.tar.gz volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.tar.bz2 volse-hubzilla-6324a07dd8b17db5da0ce66c99fb69e2f3ec49e1.zip | |
Rebase from upstream
Diffstat (limited to 'include/ItemObject.php')
| -rw-r--r-- | include/ItemObject.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 96abe4df6..7c75e35bd 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -101,11 +101,19 @@ class Item extends BaseObject { else $edpost = false; + if($observer['xchan_hash'] == $this->get_data_value('author_xchan') || $observer['xchan_hash'] == $this->get_data_value('owner_xchan') || $this->get_data_value('uid') == local_user()) $dropping = true; + + if(array_key_exists('real_uid',$item)) { + $edpost = false; + $dropping = false; + } + + if($dropping) { $drop = array( 'dropping' => $dropping, @@ -119,7 +127,7 @@ class Item extends BaseObject { ); } - $filer = (($conv->get_profile_owner() == local_user()) ? t("Save to Folder") : false); + $filer = ((($conv->get_profile_owner() == local_user()) && (! array_key_exists('real_uid',$item))) ? t("Save to Folder") : false); $profile_avatar = $item['author']['xchan_photo_m']; $profile_link = chanlink_url($item['author']['xchan_url']); @@ -163,7 +171,7 @@ class Item extends BaseObject { if($this->is_toplevel()) { // FIXME check this permission - if($conv->get_profile_owner() == local_user()) { + if(($conv->get_profile_owner() == local_user()) && (! array_key_exists('real_uid',$item))) { // FIXME we don't need all this stuff, some can be done in the template |