diff --git a/boot.php b/boot.php index 9581541bd4..1a6bf622c4 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.987' ); +define ( 'FRIENDIKA_VERSION', '2.2.988' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1054 ); diff --git a/include/conversation.php b/include/conversation.php index 5f761ccf0e..4fa4b92ada 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"), diff --git a/mod/item.php b/mod/item.php index 8c9e004c3f..66fdc13af3 100644 --- a/mod/item.php +++ b/mod/item.php @@ -589,9 +589,6 @@ function item_post(&$a) { dbesc(datetime_convert()), intval($post_id) ); - foreach( $r as $key => $val) { - logger("key: " . $key . " val: " . $val); - } // photo comments turn the corresponding item visible to the profile wall // This way we don't see every picture in your new photo album posted to your wall at once.