diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-04 06:01:15 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-04 06:01:15 +0100 |
| commit | 8f810a3dcfd60c00b14d3da811e1c0cf005e8ced (patch) | |
| tree | 07b801766018c60bd58a476bc60e85671bd70706 /mod | |
| parent | 36ac48779c85ae324d2d702714677e360af5930d (diff) | |
| parent | 006efbd906980fca8c0c377fa2b0a4054c2849f4 (diff) | |
| download | volse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.tar.gz volse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.tar.bz2 volse-hubzilla-8f810a3dcfd60c00b14d3da811e1c0cf005e8ced.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 6 | ||||
| -rw-r--r-- | mod/oep.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mod/channel.php b/mod/channel.php index f88a5bf45..dcccb16b6 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -157,10 +157,8 @@ function channel_content(&$a, $update = 0, $load = false) { $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"; - } - + $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) diff --git a/mod/oep.php b/mod/oep.php index 8d959c3e2..3855a1b4a 100644 --- a/mod/oep.php +++ b/mod/oep.php @@ -32,6 +32,8 @@ function oep_init(&$a) { $arr = oep_display_reply($_REQUEST); elseif(fnmatch('*/channel/*mid=*',$url)) $arr = oep_mid_reply($_REQUEST); + elseif(fnmatch('*/channel*',$url)) + $arr = oep_profile_reply($_REQUEST); elseif(fnmatch('*/profile/*',$url)) $arr = oep_profile_reply($_REQUEST); |