like comments

diff --git a/include/conversation.php b/include/conversation.php
index d0ced1d18a2c73119b1ac372c8087a46a7e42c85..946014b6d402bcbf10ebfa1d08b40cf2b4ef886e 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -549,13 +549,13 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $shareable = ((($profile_owner == local_user()) &&  ((! $item['private']) || $item['network'] === NETWORK_FEED)) ? true : false); 
 
                                if($page_writeable) {
-                                       if($toplevelpost) {
+                       /*              if($toplevelpost) { */
                                                $likebuttons = array(
                                                        'like' => array( t("I like this \x28toggle\x29"), t("like")),
                                                        'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
                                                );
                                                if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
-                                       }
+                               /*      } */
 
                                        $qc = $qcomment =  null;
 

diff --git a/mod/like.php b/mod/like.php
index 942a04fe7f1980318599fdc55e1fc13a17621cb0..642e948fdd6752f9923b50fe7df08eaab88416b0 100755 (executable)
--- a/mod/like.php
+++ b/mod/like.php
@@ -37,7 +37,7 @@ function like_content(&$a) {
        logger('like: verb ' . $verb . ' item ' . $item_id);
 
 
-       $r = q("SELECT * FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s') AND `id` = `parent` LIMIT 1",
+       $r = q("SELECT * FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
                dbesc($item_id),
                dbesc($item_id)
        );
@@ -217,6 +217,7 @@ EOT;
        $arr['gravity'] = GRAVITY_LIKE;
        $arr['parent'] = $item['id'];
        $arr['parent-uri'] = $item['uri'];
+       $arr['thr-parent'] = $item['uri'];
        $arr['owner-name'] = $remote_owner['name'];
        $arr['owner-link'] = $remote_owner['url'];
        $arr['owner-avatar'] = $remote_owner['thumb'];