aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-18 14:25:55 -0700
committerfriendica <info@friendica.com>2013-10-18 14:25:55 -0700
commit3772682204544e733baf910e6dfe35c0fe99e0e2 (patch)
tree5ca11953a9ee07ff04457dff7011a58ce239f31c /include
parent4a87ebfc1267b04a84b278089f4482018d067786 (diff)
downloadvolse-hubzilla-3772682204544e733baf910e6dfe35c0fe99e0e2.tar.gz
volse-hubzilla-3772682204544e733baf910e6dfe35c0fe99e0e2.tar.bz2
volse-hubzilla-3772682204544e733baf910e6dfe35c0fe99e0e2.zip
Put a status editor on the display page if you're logged in. This fixes issue #113 and also provides the ability to reshare from that page.
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 1820a8568..f9568c23f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1076,7 +1076,7 @@ function status_editor($a,$x,$popup=false) {
call_hooks('jot_networks', $jotnets);
$o .= replace_macros($tpl,array(
- '$return_path' => $a->query_string,
+ '$return_path' => ((x($x,'return_path')) ? $x['return_path'] : $a->query_string),
'$action' => $a->get_baseurl(true) . '/item',
'$share' => (x($x,'button') ? $x['button'] : t('Share')),
'$webpage' => $webpage,