aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-07-31 02:35:46 +0200
committergit-marijus <mario@mariovavti.com>2017-07-31 02:35:46 +0200
commit988371be0b2df3f917da67f39814e21f96f9f957 (patch)
tree9c50c8ae45323c0b06e837a9ecc6c9f873fe0404
parentb4efe8ad8d91c70bf869259e6764e7e4a079563b (diff)
downloadvolse-hubzilla-988371be0b2df3f917da67f39814e21f96f9f957.tar.gz
volse-hubzilla-988371be0b2df3f917da67f39814e21f96f9f957.tar.bz2
volse-hubzilla-988371be0b2df3f917da67f39814e21f96f9f957.zip
disable file notifications on initial upload for now - it can behave funky when uploading multiple small files at once
-rw-r--r--include/attach.php6
-rw-r--r--view/tpl/cloud_actionspanel.tpl2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/attach.php b/include/attach.php
index 785969a32..75235d7e1 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -888,9 +888,9 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
}
if($notify) {
- $cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path'];
- $object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath);
- file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify);
+ //$cloudPath = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['0']['display_path'];
+ //$object = get_file_activity_object($channel['channel_id'], $r['0']['hash'], $cloudPath);
+ //file_activity($channel['channel_id'], $object, $r['0']['allow_cid'], $r['0']['allow_gid'], $r['0']['deny_cid'], $r['0']['deny_gid'], 'post', $notify);
}
return $ret;
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index fc3e7f82f..baee48da3 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -26,7 +26,7 @@
<input type="hidden" name="return_url" value="{{$return_url}}" />
<label for="files-upload">{{$upload_header}}</label>
<input class="form-group pull-left" id="files-upload" type="file" name="userfile">
- {{include file="field_checkbox.tpl" field=$notify}}
+ {{**include file="field_checkbox.tpl" field=$notify**}}
<div class="pull-right btn-group">
<div class="btn-group">
{{if $lockstate}}