diff options
| author | friendica <info@friendica.com> | 2012-07-24 22:06:21 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-24 22:06:21 -0700 |
| commit | 6911beca2f1d88a9e26c1dc110b2547a1b075951 (patch) | |
| tree | 094aa281b0d896c8d2f0a039b16cbbb80d3c0b68 /include | |
| parent | f535554cfa3a2de345f4028b109f4e941fc3a91b (diff) | |
| download | volse-hubzilla-6911beca2f1d88a9e26c1dc110b2547a1b075951.tar.gz volse-hubzilla-6911beca2f1d88a9e26c1dc110b2547a1b075951.tar.bz2 volse-hubzilla-6911beca2f1d88a9e26c1dc110b2547a1b075951.zip | |
ajax page loads
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/include/conversation.php b/include/conversation.php index 958400db3..50ce51558 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -346,6 +346,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $page_writeable = false; } + + $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); + + if($update) $return_url = $_SESSION['return_url']; else @@ -869,14 +873,26 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } } - $page_template = get_markup_template("conversation.tpl"); - $o = replace_macros($page_template, array( - '$baseurl' => $a->get_baseurl($ssl_state), - '$mode' => $mode, - '$user' => $a->user, - '$threads' => $threads, - '$dropping' => ($dropping?t('Delete Selected Items'):False), - )); + logger('threads: ' . count($threads) . ' update: ' . $update); + + if($update) { + $page_template = get_markup_template("conv.tpl"); + $o = replace_macros($page_template, array( + '$baseurl' => $a->get_baseurl($ssl_state), + '$mode' => $mode, + '$user' => $a->user, + '$threads' => $threads, + )); + } + else { + $page_template = get_markup_template("conv_frame.tpl"); + $o = replace_macros($page_template, array( + '$baseurl' => $a->get_baseurl($ssl_state), + '$mode' => $mode, + '$user' => $a->user, + '$dropping' => ($page_dropping?t('Delete Selected Items'):False), + )); + } return $o; }} |