aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Module/Item.php5
-rw-r--r--include/conversation.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 5618137a1..9b4896cd0 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -898,6 +898,11 @@ class Item extends Controller {
*/
if (!$preview) {
+
+ hz_syslog(print_r($gacl, true));
+
+
+ //if ($parent_item && ($parent_item['owner_xchan'] === $channel['channel_hash']))
fix_attached_permissions($profile_uid, ((strpos($body, '[/crypt]')) ? $_POST['media_str'] : $body), $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $token);
//fix_attached_photo_permissions($profile_uid, $owner_xchan['xchan_hash'], ((strpos($body, '[/crypt]')) ? $_POST['media_str'] : $body), $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $token);
//fix_attached_file_permissions($channel, $observer['xchan_hash'], ((strpos($body, '[/crypt]')) ? $_POST['media_str'] : $body), $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny, $token);
diff --git a/include/conversation.php b/include/conversation.php
index ee599c28d..25acd8e4b 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -452,7 +452,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
// Allow uploading if OCAP tokens are enabled
if (PConfig::Get(local_channel(), 'system', 'ocap_enabled')) {
- $uploading = true;
+ // $uploading = true;
}
}