more zcard tweaks
This commit is contained in:
parent
06dcaaa821
commit
a7ed50ecd4
@ -1829,6 +1829,10 @@ function get_zcard($channel,$observer_hash = '',$args = array()) {
|
|||||||
$cover = $r[0];
|
$cover = $r[0];
|
||||||
$cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale'];
|
$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(
|
$o .= replace_macros(get_markup_template('zcard.tpl'),array(
|
||||||
'$scale' => $scale,
|
'$scale' => $scale,
|
||||||
|
@ -157,9 +157,7 @@ function channel_content(&$a, $update = 0, $load = false) {
|
|||||||
|
|
||||||
$simple_update = (($update) ? " AND item_unseen = 1 " : '');
|
$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'])
|
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']) . "' ) ";
|
$simple_update = " AND (( item_unseen = 1 AND item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) OR item.changed > '" . datetime_convert('UTC','UTC',$_SESSION['loadtime']) . "' ) ";
|
||||||
|
@ -32,6 +32,8 @@ function oep_init(&$a) {
|
|||||||
$arr = oep_display_reply($_REQUEST);
|
$arr = oep_display_reply($_REQUEST);
|
||||||
elseif(fnmatch('*/channel/*mid=*',$url))
|
elseif(fnmatch('*/channel/*mid=*',$url))
|
||||||
$arr = oep_mid_reply($_REQUEST);
|
$arr = oep_mid_reply($_REQUEST);
|
||||||
|
elseif(fnmatch('*/channel*',$url))
|
||||||
|
$arr = oep_profile_reply($_REQUEST);
|
||||||
elseif(fnmatch('*/profile/*',$url))
|
elseif(fnmatch('*/profile/*',$url))
|
||||||
$arr = oep_profile_reply($_REQUEST);
|
$arr = oep_profile_reply($_REQUEST);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user