diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-21 19:26:24 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-21 19:26:24 +0200 |
| commit | 71e2dbf3522dcf076458805ee65dc976fb35a6f3 (patch) | |
| tree | 5c11d463eff15245458f5033d7d425671df8f1d0 /include/conversation.php | |
| parent | a147d6113c081694d4209002fa5e57106d4c6f41 (diff) | |
| parent | bdbe068b95e8c302179530dff7583997ff35f246 (diff) | |
| download | volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.gz volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.tar.bz2 volse-hubzilla-71e2dbf3522dcf076458805ee65dc976fb35a6f3.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/conversation.php b/include/conversation.php index f4a564742..1b869b91e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -342,7 +342,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { 'body' => template_escape($body), 'text' => strip_tags(template_escape($body)), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), - 'lock' => $lock, 'location' => template_escape($location), 'indent' => '', 'owner_name' => template_escape($owner_name), @@ -400,6 +399,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } $comments_collapsed = false; + $comments_seen = 0; $comment_lastcollapsed = false; $comment_firstcollapsed = false; $blowhard = 0; @@ -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; @@ -709,7 +709,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { } $page_template = get_markup_template("conversation.tpl"); - $o .= replace_macros($page_template, array( + $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), '$mode' => $mode, '$user' => $a->user, @@ -1074,7 +1074,6 @@ function find_thread_parent_index($arr,$x) { } function render_location_google($item) { - $location = ''; $location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''); $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : ''); if($coord) { |