diff options
| author | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-09-28 23:17:47 +0200 |
|---|---|---|
| committer | tuscanhobbit <tuscanhobbit@users.noreply.github.com> | 2014-09-28 23:17:47 +0200 |
| commit | f104dc840c79f4ea666a85033bffbf4a33d06f4e (patch) | |
| tree | f1fce3898b757e3a29e928cc1afe724edb620471 /include/ItemObject.php | |
| parent | 6e141a8a53ba6cb7d91b989985744fdcd3d6f13d (diff) | |
| parent | eaf96f987a5f22a54fdbb4cedef52b0159a37ad0 (diff) | |
| download | volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.tar.gz volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.tar.bz2 volse-hubzilla-f104dc840c79f4ea666a85033bffbf4a33d06f4e.zip | |
Merge from origin
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 |