diff options
| author | Mario <mario@mariovavti.com> | 2021-08-29 10:51:44 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-08-29 10:51:44 +0000 |
| commit | 5532560d07d50cdeef54054c829a4591cf05a8a4 (patch) | |
| tree | adfec5148b56d3b8bd20f53ef156788edc9da08e /include | |
| parent | ed277dbda931c31ac209561784af2a7f1e360d49 (diff) | |
| download | volse-hubzilla-5532560d07d50cdeef54054c829a4591cf05a8a4.tar.gz volse-hubzilla-5532560d07d50cdeef54054c829a4591cf05a8a4.tar.bz2 volse-hubzilla-5532560d07d50cdeef54054c829a4591cf05a8a4.zip | |
do not define colors in manifest (system colors are mostly the better fit) and use profile fullname instead of channel_name in nav
Diffstat (limited to 'include')
| -rw-r--r-- | include/channel.php | 6 | ||||
| -rw-r--r-- | include/nav.php | 2 |
2 files changed, 4 insertions, 4 deletions
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') ]); |