aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-09-30 16:06:53 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-09-30 16:06:53 -0700
commit7ad27f5737b4c3dc800c8a707a3010ec33672389 (patch)
tree2f16e996932abd8c6046176bafac157da9adfa02 /mod
parenta0a7c3be8bdb5623344351b2948911e9770dc949 (diff)
downloadvolse-hubzilla-7ad27f5737b4c3dc800c8a707a3010ec33672389.tar.gz
volse-hubzilla-7ad27f5737b4c3dc800c8a707a3010ec33672389.tar.bz2
volse-hubzilla-7ad27f5737b4c3dc800c8a707a3010ec33672389.zip
implement rel alternate, some corresponding last minute touchups on display module
Diffstat (limited to 'mod')
-rw-r--r--mod/display.php13
-rw-r--r--mod/network.php1
2 files changed, 5 insertions, 9 deletions
diff --git a/mod/display.php b/mod/display.php
index 451b9d644..d8aca43e4 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -155,6 +155,9 @@ function display_content(&$a) {
: '<div class="wall-item-lock"></div>');
if(can_write_wall($a,$a->profile['uid'])) {
+ if($item['id'] == $item['parent']) {
+ $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
+ }
if($item['last-child']) {
$comment = replace_macros($cmnt_tpl,array(
'$return_path' => $_SESSION['return_url'],
@@ -219,20 +222,14 @@ function display_content(&$a) {
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
$profile_link = $profile_url;
- $drop = '';
-
if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == get_uid()))
$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
+ else
+ $drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id']));
$like = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
$dislike = (($dlike[$item['id']]) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
- $likebuttons = '';
- if($item['id'] == $item['parent']) {
- $likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
- }
-
-
$o .= replace_macros($template,array(
'$id' => $item['item_id'],
diff --git a/mod/network.php b/mod/network.php
index ac5664b4f..9d12d4346 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -234,7 +234,6 @@ function network_content(&$a, $update = 0) {
));
}
-
$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));