diff options
| author | Mario <mario@mariovavti.com> | 2022-10-26 21:56:32 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-10-26 21:56:32 +0000 |
| commit | 95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d (patch) | |
| tree | 582116e7571ae7eaa4a51578b2f5ebeae31f75a9 /include/conversation.php | |
| parent | ef2448e17e742e7dcef458993bce1e0a29756aa7 (diff) | |
| parent | 9554f535199b5fb3a23dd40f9921a15339da3bd7 (diff) | |
| download | volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.tar.gz volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.tar.bz2 volse-hubzilla-95f6f9e10aca66c30a1ef7ac6ed24fd6e352007d.zip | |
Merge branch 'dev'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2b00c12be..46621a243 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -643,10 +643,9 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa $channel = App::get_channel(); $observer = App::get_observer(); - if($update) - $return_url = $_SESSION['return_url']; - else - $return_url = $_SESSION['return_url'] = App::$query_string; + if (!$update) { + $_SESSION['return_url'] = App::$query_string; + } load_contact_links(local_channel()); @@ -1328,7 +1327,7 @@ function hz_status_editor($a, $x, $popup = false) { if(x($x, 'hide_future')) $feature_future = false; - $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); + $geotag = ((isset($x['allow_location']) && $x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $setloc = t('Set your location'); $clearloc = ((get_pconfig($x['profile_uid'], 'system', 'use_browser_location')) ? t('Clear browser location') : ''); if(x($x, 'hide_location')) @@ -1491,10 +1490,10 @@ function hz_status_editor($a, $x, $popup = false) { '$content' => ((x($x,'body')) ? htmlspecialchars($x['body'], ENT_COMPAT,'UTF-8') : ''), '$attachment' => ((x($x, 'attachment')) ? $x['attachment'] : ''), '$post_id' => ((x($x, 'post_id')) ? $x['post_id'] : ''), - '$defloc' => $x['default_location'], - '$visitor' => $x['visitor'], - '$lockstate' => $x['lockstate'], - '$acl' => $x['acl'], + '$defloc' => $x['default_location'] ?? '', + '$visitor' => $x['visitor'] ?? '', + '$lockstate' => $x['lockstate'] ?? '', + '$acl' => $x['acl'] ?? '', '$allow_cid' => acl2json($x['permissions']['allow_cid']), '$allow_gid' => acl2json($x['permissions']['allow_gid']), '$deny_cid' => acl2json($x['permissions']['deny_cid']), @@ -1502,7 +1501,7 @@ function hz_status_editor($a, $x, $popup = false) { '$mimeselect' => $mimeselect, '$layoutselect' => $layoutselect, '$showacl' => ((array_key_exists('showacl', $x)) ? $x['showacl'] : true), - '$bang' => $x['bang'], + '$bang' => $x['bang'] ?? '', '$profile_uid' => $x['profile_uid'], '$preview' => $preview, '$source' => ((x($x, 'source')) ? $x['source'] : ''), |