aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php4
-rwxr-xr-xmod/like.php3
2 files changed, 4 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php
index d0ced1d18..946014b6d 100644
--- 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 942a04fe7..642e948fd 100755
--- 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'];