X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=a7f43b5d4f23f5a978b756bc2519023d52979260;hb=01a03e34c8d286011c0f4301e60c103d992a449a;hp=795997868305ff09b2ada3614cf7a9a8d1089cf3;hpb=697222575df146849ff303c6d5e83733cd5236af;p=quix0rs-gnu-social.git diff --git a/lib/util.php b/lib/util.php index 7959978683..a7f43b5d4f 100644 --- a/lib/util.php +++ b/lib/util.php @@ -803,7 +803,7 @@ function common_linkify($url) { } if (!empty($f)) { - if ($f->getEnclosure()) { + if ($f->getEnclosure() || File_oembed::staticGet('file_id',$f->id)) { $is_attachment = true; $attachment_id = $f->id; @@ -1176,19 +1176,10 @@ function common_enqueue_notice($notice) $transports[] = 'plugin'; } - $xmpp = common_config('xmpp', 'enabled'); - - if ($xmpp) { - $transports[] = 'jabber'; - } - // @fixme move these checks into QueueManager and/or individual handlers if ($notice->is_local == Notice::LOCAL_PUBLIC || $notice->is_local == Notice::LOCAL_NONPUBLIC) { $transports = array_merge($transports, $localTransports); - if ($xmpp) { - $transports[] = 'public'; - } } if (Event::handle('StartEnqueueNotice', array($notice, &$transports))) {