aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-20 15:02:23 -0800
committerzotlabs <mike@macgirvin.com>2017-11-20 15:02:23 -0800
commitd2e3e3003a4291416bc97ee6b23903a70c08bf5f (patch)
tree0e69a88878b4e6e6615f0b14577761842a5043fc
parent56d981c8ef0680d5124214b4cd8849b9a42feeb7 (diff)
downloadvolse-hubzilla-d2e3e3003a4291416bc97ee6b23903a70c08bf5f.tar.gz
volse-hubzilla-d2e3e3003a4291416bc97ee6b23903a70c08bf5f.tar.bz2
volse-hubzilla-d2e3e3003a4291416bc97ee6b23903a70c08bf5f.zip
set display_path for photo_upload from the DAV File interface
-rw-r--r--Zotlabs/Storage/File.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index 37376c177..53d5d3476 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -129,12 +129,16 @@ class File extends DAV\Node implements DAV\IFile {
$album = '';
$os_path = '';
- $r = q("SELECT flags, folder, os_storage, os_path, filename, is_photo FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
+ $r = q("SELECT flags, folder, os_storage, os_path, display_path, filename, is_photo FROM attach WHERE hash = '%s' AND uid = %d LIMIT 1",
dbesc($this->data['hash']),
intval($c[0]['channel_id'])
);
if ($r) {
+
$os_path = $r[0]['os_path'];
+ $display_path = $r[0]['display_path'];
+ $filename = $r[0]['filename'];
+
if (intval($r[0]['os_storage'])) {
$d = q("select folder, content from attach where hash = '%s' and uid = %d limit 1",
@@ -210,7 +214,7 @@ class File extends DAV\Node implements DAV\IFile {
if($is_photo) {
require_once('include/photos.php');
- $args = array( 'resource_id' => $this->data['hash'], 'album' => $album, 'os_syspath' => $f, 'os_path' => $os_path, 'filename' => $r[0]['filename'], 'getimagesize' => $gis, 'directory' => $direct );
+ $args = array( 'resource_id' => $this->data['hash'], 'album' => $album, 'os_syspath' => $f, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct );
$p = photo_upload($c[0],\App::get_observer(),$args);
}