diff options
| author | zottel <github@zottel.net> | 2012-05-10 09:58:52 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-10 09:58:52 +0200 |
| commit | 4709960189e48fa1e073035cde916767f3dd830e (patch) | |
| tree | c8c7bb81562374480912deff42986bbef434879f /include/conversation.php | |
| parent | d92be9d93cc6a9b90572cd46e982e24f57c43ffc (diff) | |
| parent | 7b41c0a555c5b58b2a09be0424bb09af7fa49b42 (diff) | |
| download | volse-hubzilla-4709960189e48fa1e073035cde916767f3dd830e.tar.gz volse-hubzilla-4709960189e48fa1e073035cde916767f3dd830e.tar.bz2 volse-hubzilla-4709960189e48fa1e073035cde916767f3dd830e.zip | |
Merge remote branch 'upstream/master'
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 521b4623b..e48a8e6d6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -959,7 +959,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); $o .= replace_macros($tpl,array( - '$return_path' => $a->cmd, + '$return_path' => $a->query_string, '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), '$upload' => t('Upload photo'), |