aboutsummaryrefslogtreecommitdiffstats
path: root/include/attach.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-14 13:19:52 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-14 13:19:52 -0700
commit9b4d32b68c6f540be0bebb38883aaa002c34d0f2 (patch)
treef5c56683dc724a28aac4e0c390ea33f70db90bfc /include/attach.php
parentf4e708a02f70e0ca2dbe43419d6f1c92ff2000e9 (diff)
parentd616099de6984ad8d45e3b8908367bf5a0b8ab31 (diff)
downloadvolse-hubzilla-9b4d32b68c6f540be0bebb38883aaa002c34d0f2.tar.gz
volse-hubzilla-9b4d32b68c6f540be0bebb38883aaa002c34d0f2.tar.bz2
volse-hubzilla-9b4d32b68c6f540be0bebb38883aaa002c34d0f2.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/attach.php')
-rw-r--r--include/attach.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/attach.php b/include/attach.php
index 266efee53..0ed1690ec 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -405,7 +405,6 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
require_once('include/photos.php');
-
call_hooks('photo_upload_begin',$arr);
$ret = array('success' => false);
@@ -416,6 +415,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$newalbum = (($arr) ? $arr['newalbum'] : '');
$hash = (($arr && $arr['hash']) ? $arr['hash'] : null);
$upload_path = (($arr && $arr['directory']) ? $arr['directory'] : '');
+ $visible = (($arr && $arr['visible']) ? $arr['visible'] : '');
$observer = array();
@@ -792,7 +792,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
if($is_photo) {
- $args = array( 'source' => $source, 'visible' => 0, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct);
+ $args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct);
if($arr['contact_allow'])
$args['contact_allow'] = $arr['contact_allow'];
if($arr['group_allow'])