aboutsummaryrefslogtreecommitdiffstats
path: root/mod/channel.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-02 17:51:34 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-02 17:51:34 +0100
commit36ac48779c85ae324d2d702714677e360af5930d (patch)
treef6e78cb3cefe3abf5dcac291938005d75ecb0bff /mod/channel.php
parent0cd82ec680e6a5a352781861a63685038fea723a (diff)
parent88669fa033d5b43d4cdad7b95c9af05bf9467d3b (diff)
downloadvolse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.gz
volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.tar.bz2
volse-hubzilla-36ac48779c85ae324d2d702714677e360af5930d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/channel.php')
-rw-r--r--mod/channel.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/mod/channel.php b/mod/channel.php
index 3b80e2cb8..f88a5bf45 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -156,7 +156,11 @@ function channel_content(&$a, $update = 0, $load = false) {
$abook_uids = " and abook.abook_channel = " . intval($a->profile['profile_uid']) . " ";
$simple_update = (($update) ? " AND item_unseen = 1 " : '');
-
+
+ if($mid) {
+ $a->page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . $a->query_string) . '" title="oembed" />' . "\r\n";
+ }
+
if($update && $_SESSION['loadtime'])
$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
if($load)