diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-04-17 18:07:20 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-04-17 18:07:20 +0200 |
| commit | dbff4252d4ac7ccc1cda6b378a53c6761ea4c49d (patch) | |
| tree | 23e17c4ceb420292d2dff3137ad4723f3d94fb4f /include/conversation.php | |
| parent | 757e3429ac6928c45ffebf0b64288e63efbc6322 (diff) | |
| parent | b30c761aae7e01e6fe727232e48b14303484a228 (diff) | |
| download | volse-hubzilla-dbff4252d4ac7ccc1cda6b378a53c6761ea4c49d.tar.gz volse-hubzilla-dbff4252d4ac7ccc1cda6b378a53c6761ea4c49d.tar.bz2 volse-hubzilla-dbff4252d4ac7ccc1cda6b378a53c6761ea4c49d.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php index e5549a9c1..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; @@ -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) { |