aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-16 13:53:05 +0200
committerzottel <github@zottel.net>2012-04-16 13:53:05 +0200
commit041f74dc775424f686a1cd95c00e0d63bfc4b99c (patch)
tree8ed665432fc5014a7a75c77eebaaa14b8b714f7c /include/conversation.php
parenta2c4ce74871dbe9e640cdeafc1574bda5b7fe144 (diff)
parentfd2f7dd6ae8871f09674a5325fd4d4ccea56b623 (diff)
downloadvolse-hubzilla-041f74dc775424f686a1cd95c00e0d63bfc4b99c.tar.gz
volse-hubzilla-041f74dc775424f686a1cd95c00e0d63bfc4b99c.tar.bz2
volse-hubzilla-041f74dc775424f686a1cd95c00e0d63bfc4b99c.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php13
1 files changed, 4 insertions, 9 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 5396a125d..e5549a9c1 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -559,10 +559,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
}
}
- $edpost = (((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1)) || ($mode === 'notes'))
- ? array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"))
- : False);
-
+ if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+ $edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+ else
+ $edpost = false;
$drop = '';
$dropping = false;
@@ -626,10 +626,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
else
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
-
-
-
-
$like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
@@ -1089,4 +1085,3 @@ function render_location_google($item) {
}
return $location;
}
-