diff options
| author | Chris Case <kahotep@bunda.dreamhost.com> | 2011-05-22 19:20:12 -0700 |
|---|---|---|
| committer | Chris Case <kahotep@bunda.dreamhost.com> | 2011-05-22 19:20:12 -0700 |
| commit | 150830d38c2191d2e55a373043af176208d4b430 (patch) | |
| tree | 44cad869fb3a152e40b1111a35ac0c7774e3e703 /include/conversation.php | |
| parent | 991885f1d40b8a8f16cd17c028f5c93eba69a5f3 (diff) | |
| parent | 44a22c29155fa3beeed7cd5d0add30818e409891 (diff) | |
| download | volse-hubzilla-150830d38c2191d2e55a373043af176208d4b430.tar.gz volse-hubzilla-150830d38c2191d2e55a373043af176208d4b430.tar.bz2 volse-hubzilla-150830d38c2191d2e55a373043af176208d4b430.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 5f761ccf0..4fa4b92ad 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -357,7 +357,7 @@ function conversation(&$a, $items, $mode, $update) { if($page_writeable) { if($toplevelpost) { - $likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array( + $likebuttons = replace_macros((($item['private'] || ($profile_owner != local_user())) ? $noshare_tpl : $like_tpl),array( '$id' => $item['id'], '$likethis' => t("I like this \x28toggle\x29"), '$nolike' => t("I don't like this \x28toggle\x29"), |