diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/attach.php | 3 | ||||
-rw-r--r-- | include/channel.php | 6 | ||||
-rw-r--r-- | include/nav.php | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/attach.php b/include/attach.php index 56fb936e7..ef3d6e242 100644 --- a/include/attach.php +++ b/include/attach.php @@ -684,7 +684,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $pathname = ''; - if($is_photo) { + if($source === 'photos') { if($newalbum) { $pathname = filepath_macro($newalbum); } @@ -698,6 +698,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { elseif(array_key_exists('folder',$arr)) { $pathname = find_path_by_hash($channel['channel_id'], $arr['folder']); } + if(! $pathname) { $pathname = filepath_macro($upload_path); } diff --git a/include/channel.php b/include/channel.php index 3ee2742b8..ed46904e7 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1041,11 +1041,11 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals // @fixme - Not totally certain how to handle $zot_compat for the event timezone which exists // in Hubzilla but is stored with the item and not the event. In Zap, stored information is - // always UTC and localised on access as per standard conventions for working with global time data. + // always UTC and localised on access as per standard conventions for working with global time data. // Older Zot (pre-Zot6) records aren't translated correctly w/r/t AS2 so only include events for the last year or so if - // migrating to Zap. - + // migrating to Zap. + $sqle = (($zap_compat) ? " and created > '2020-01-01 00:00:00' " : ''); $r = q("select * from event where uid = %d $sqle", diff --git a/include/nav.php b/include/nav.php index 0e75cd59f..7cc64ab1b 100644 --- a/include/nav.php +++ b/include/nav.php @@ -337,7 +337,7 @@ function nav($template = 'default') { '$featured_apps' => t('Featured Apps'), '$url' => (($url) ? $url : z_root() . '/' . App::$cmd), '$settings_url' => $settings_url, - '$name' => ((!$is_owner) ? App::$profile['channel_name'] : ''), + '$name' => ((!$is_owner) ? App::$profile['fullname'] : ''), '$thumb' => ((!$is_owner) ? App::$profile['thumb'] : ''), '$form_security_token' => get_form_security_token('pconfig') ]); |