harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add os_path and display_path to photos, fix some issues with multiple path separators after cloud/nickname in the content field of attach and photos

Browse Source
This commit is contained in:
zotlabs
2017-03-14 22:02:28 -07:00
committed by Mario Vavti
parent ec5e1067bc
commit fa5115b3ed
3 changed files with 12 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/attach.php
View File

@@ -702,11 +702,10 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$os_relpath .= $folder_hash . '/';
}
$os_relpath .= $hash;
// not yet used
$os_path = ltrim($os_relpath,'/');
$os_relpath .= $hash;
$os_relpath = ltrim($os_relpath,'/');
$os_path = $os_relpath;
$display_path = $pathname . '/' . $filename;
if($src)
@@ -811,7 +810,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
if($is_photo) {
$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_syspath' => $os_basepath . $os_relpath, 'os_path' => $os_path, 'display_path' => $display_path, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
if($arr['contact_allow'])
$args['contact_allow'] = $arr['contact_allow'];
if($arr['group_allow'])