aboutsummaryrefslogtreecommitdiffstats
path: root/include/attach.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-27 21:40:00 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-27 21:40:00 +0100
commitc5333b518781068d866805778e2823ef6f9d40ea (patch)
treecdcd55f18150c66b43387c4bf2e6de5b2057f252 /include/attach.php
parentcf5383fdbe273af6b3858e216b313124fd125cf6 (diff)
parent2d045a12bf8ecb93a2424c07e28e6a2d0b9288e9 (diff)
downloadvolse-hubzilla-c5333b518781068d866805778e2823ef6f9d40ea.tar.gz
volse-hubzilla-c5333b518781068d866805778e2823ef6f9d40ea.tar.bz2
volse-hubzilla-c5333b518781068d866805778e2823ef6f9d40ea.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/attach.php')
-rw-r--r--include/attach.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/attach.php b/include/attach.php
index 10ff9f13f..78114b415 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -13,6 +13,7 @@
require_once('include/permissions.php');
require_once('include/security.php');
+require_once('include/group.php');
/**
* @brief Guess the mimetype from file ending.
@@ -1314,6 +1315,8 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
);
file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', $notify=1);
+
+ return;
}
/**