diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
| commit | 9d2afc2d3c12f6b70eae11487e491e2d8604ed60 (patch) | |
| tree | ced4fb400d25762866a773115b122f6c9cc498de /include/conversation.php | |
| parent | 019b735ec75989336826e5ad5db6377803ecb050 (diff) | |
| parent | 2e43b291e73f6d7c36a9d8743fc2635dc3444841 (diff) | |
| download | volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.gz volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.bz2 volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index 6b5bf8d7c..6aad2485a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -111,7 +111,7 @@ function conversation(&$a, $items, $mode, $update) { } if($mode === 'notes') { - $profile_owner = $a->profile['profile_uid']; + $profile_owner = local_user(); $page_writeable = true; } @@ -381,12 +381,12 @@ function conversation(&$a, $items, $mode, $update) { } } - $likebuttons = ''; + $shareable = ((($profile_owner == local_user()) && ($mode != 'display') && (! $item['private'])) ? true : false); if($page_writeable) { if($toplevelpost) { - $likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array( + $likebuttons = replace_macros(((($shareable)) ? $like_tpl : $noshare_tpl),array( '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), |