bug #147 comments not working on private notes page

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 3353cb2b73cd693907992d6a49159096c23bdfb4..6aad2485a7ab505d4ead881af73ea14e2b0295cd 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -80,8 +80,6 @@ function localize_item(&$item){
 
        }
         
-       // fix bad embeds
-       $item['body'] = str_replace('http://www.youtube.com/embed/http:','http:',$item['body']);
 
 }
 
@@ -113,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;
        }
 
@@ -383,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"),