diff options
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/lib/util.php b/lib/util.php index 7a170a5f5..add1b0ae6 100644 --- a/lib/util.php +++ b/lib/util.php @@ -550,7 +550,7 @@ function common_find_mentions($text, $notice) } else if (!empty($originalMentions) && array_key_exists($nickname, $originalMentions)) { - $mention = $originalMentions[$nickname]; + $mentioned = $originalMentions[$nickname]; } else { $mentioned = common_relative_profile($sender, $nickname); } @@ -770,20 +770,13 @@ function common_linkify($url) { } if (!empty($f)) { - if ($f->isEnclosure()) { + if ($f->getEnclosure()) { $is_attachment = true; $attachment_id = $f->id; - } else { - $foe = File_oembed::staticGet('file_id', $f->id); - if (!empty($foe)) { - // if it has OEmbed info, it's an attachment, too - $is_attachment = true; - $attachment_id = $f->id; - - $thumb = File_thumbnail::staticGet('file_id', $f->id); - if (!empty($thumb)) { - $has_thumb = true; - } + + $thumb = File_thumbnail::staticGet('file_id', $f->id); + if (!empty($thumb)) { + $has_thumb = true; } } } |