diff options
| -rw-r--r-- | addon/facebook/facebook.php | 6 | ||||
| -rw-r--r-- | include/conversation.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 8d8f5a2e5..15dffa594 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -816,8 +816,10 @@ function fb_consume_stream($uid,$j,$wall = false) { $datarray['owner-link'] = $self[0]['url']; $datarray['owner-avatar'] = $self[0]['thumb']; } - - $datarray['app'] = 'facebook'; + if(isset($entry->application) && isset($entry->application->name) && strlen($entry->application->name)) + $datarray['app'] = $entry->application->name; + else + $datarray['app'] = 'facebook'; $datarray['author-name'] = $from->name; $datarray['author-link'] = 'http://facebook.com/profile.php?id=' . $from->id; $datarray['author-avatar'] = 'https://graph.facebook.com/' . $from->id . '/picture'; diff --git a/include/conversation.php b/include/conversation.php index 1fd9c31ec..ff0a7612b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -464,7 +464,7 @@ function conversation(&$a, $items, $mode, $update) { '$sparkle' => $sparkle, '$title' => $item['title'], '$body' => $body, - '$ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), + '$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), '$lock' => $lock, '$location' => $location, '$indent' => $indent, |