diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-10-20 01:22:51 +0200 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-10-20 01:22:51 +0200 |
| commit | 2db45695e8067e49eb4c8a6d8044cd9cac7f07e5 (patch) | |
| tree | 7a1029e10578e99f0dbbef6e22c42eb784ddd9d1 /include/conversation.php | |
| parent | c0789bdb4fc7412efd5e2fb1e15b63d359a74cfa (diff) | |
| parent | 49fb6326e0e978f57b2f988935af6e8e3d2f4417 (diff) | |
| download | volse-hubzilla-2db45695e8067e49eb4c8a6d8044cd9cac7f07e5.tar.gz volse-hubzilla-2db45695e8067e49eb4c8a6d8044cd9cac7f07e5.tar.bz2 volse-hubzilla-2db45695e8067e49eb4c8a6d8044cd9cac7f07e5.zip | |
Merge upstream
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 2 |
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, |