aboutsummaryrefslogtreecommitdiffstats
path: root/include/RedDAV
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-15 19:52:17 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-15 19:52:17 -0700
commit2adc7a51ad0e3893efc9aac852e3b80d75d9a65d (patch)
tree7386dbe6ffcc8ff91c3f2037bcd8d2f3b55264ec /include/RedDAV
parent8c7472c6c337f0cf58d744433e3de70ab33b430b (diff)
downloadvolse-hubzilla-2adc7a51ad0e3893efc9aac852e3b80d75d9a65d.tar.gz
volse-hubzilla-2adc7a51ad0e3893efc9aac852e3b80d75d9a65d.tar.bz2
volse-hubzilla-2adc7a51ad0e3893efc9aac852e3b80d75d9a65d.zip
photo upload: pass in the contact_allow and resource_id via include/attach.php
Diffstat (limited to 'include/RedDAV')
-rw-r--r--include/RedDAV/RedDirectory.php2
-rw-r--r--include/RedDAV/RedFile.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/RedDAV/RedDirectory.php b/include/RedDAV/RedDirectory.php
index dba857cdc..c41056ac9 100644
--- a/include/RedDAV/RedDirectory.php
+++ b/include/RedDAV/RedDirectory.php
@@ -298,7 +298,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
if($is_photo) {
require_once('include/photos.php');
- $args = array( 'data' => @file_get_contents($f));
+ $args = array( 'data' => @file_get_contents($f), 'resource_id' => $hash);
$p = photo_upload($c[0],get_app()->get_observer(),$args);
}
diff --git a/include/RedDAV/RedFile.php b/include/RedDAV/RedFile.php
index 1fd2dab8f..156acde4a 100644
--- a/include/RedDAV/RedFile.php
+++ b/include/RedDAV/RedFile.php
@@ -155,7 +155,7 @@ class RedFile extends DAV\Node implements DAV\IFile {
);
if($is_photo) {
- $args = array( 'data' => @file_get_contents($fname));
+ $args = array( 'data' => @file_get_contents($fname), 'resource_id' => $this->data['hash']);
$p = photo_upload($c[0],$this->auth->observer,$args);
}