aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-02-02 19:39:47 -0800
committerredmatrix <git@macgirvin.com>2016-02-02 19:39:47 -0800
commita7ed50ecd4b4defbc1d5fdf0bb4fd7d65d08a0fd (patch)
tree7f72feb65e8f8790d6d80f631d1e608bfed1dd48
parent06dcaaa821d6229568709e53d104233081c4d3e9 (diff)
downloadvolse-hubzilla-a7ed50ecd4b4defbc1d5fdf0bb4fd7d65d08a0fd.tar.gz
volse-hubzilla-a7ed50ecd4b4defbc1d5fdf0bb4fd7d65d08a0fd.tar.bz2
volse-hubzilla-a7ed50ecd4b4defbc1d5fdf0bb4fd7d65d08a0fd.zip
more zcard tweaks
-rw-r--r--include/identity.php4
-rw-r--r--mod/channel.php6
-rw-r--r--mod/oep.php2
3 files changed, 8 insertions, 4 deletions
diff --git a/include/identity.php b/include/identity.php
index 76ada577e..4f58d7dc5 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1829,6 +1829,10 @@ function get_zcard($channel,$observer_hash = '',$args = array()) {
$cover = $r[0];
$cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale'];
}
+ else {
+ // @fixme remove this when we have a fallback cover photo and use that instead.
+ return;
+ }
$o .= replace_macros(get_markup_template('zcard.tpl'),array(
'$scale' => $scale,
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);