diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-25 00:09:42 -0700 |
| commit | b23f3fc03b6bc751aab67fe2258a21f7c65bab8e (patch) | |
| tree | 84c997aa781afa566536ca5f66eb8f90ef468476 /include/conversation.php | |
| parent | d30f718e0836a031e43d5403480aa049561e736e (diff) | |
| parent | 0b0bd3c20765d267ec6d7cc261c7713917a22582 (diff) | |
| download | volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.gz volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.tar.bz2 volse-hubzilla-b23f3fc03b6bc751aab67fe2258a21f7c65bab8e.zip | |
Merge pull request #3 from friendica/master
Align to main project HEAD
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php index 1820a8568..a8b3150b4 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -397,7 +397,7 @@ function visible_activity($item) { */ -function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { +function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $prepared_item = '') { $tstart = dba_timer(); $t0 = $t1 = $t2 = $t3 = $t4 = $t5 = $t6 = null; @@ -690,7 +690,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { 'owner_name' => $owner_name, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, - 'plink' => get_plink($item), + 'plink' => get_plink($item,$mode), 'edpost' => false, 'isstarred' => $isstarred, 'star' => $star, @@ -723,7 +723,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { require_once('include/ConversationObject.php'); require_once('include/ItemObject.php'); - $conv = new Conversation($mode, $preview); + $conv = new Conversation($mode, $preview, $prepared_item); // In the display mode we don't have a profile owner. @@ -764,7 +764,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { } - // Can we put this after the visibility check? + like_puller($a,$item,$alike,'like'); if(feature_enabled($profile_owner,'dislike')) @@ -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, |