diff options
| author | friendica <info@friendica.com> | 2012-04-17 06:50:09 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-04-17 06:50:09 -0700 |
| commit | 8269d6aa19eb71063ff578b43b237ffd4fea93b1 (patch) | |
| tree | 58ff40aa9414f8484a3f1091b616e81db720822e /include/conversation.php | |
| parent | e6330e3b966401f83d54bdd08c9ed9ab294643e0 (diff) | |
| parent | 720c8324c7572ebf51e4083430e060900cb30750 (diff) | |
| download | volse-hubzilla-8269d6aa19eb71063ff578b43b237ffd4fea93b1.tar.gz volse-hubzilla-8269d6aa19eb71063ff578b43b237ffd4fea93b1.tar.bz2 volse-hubzilla-8269d6aa19eb71063ff578b43b237ffd4fea93b1.zip | |
Merge pull request #240 from CatoTH/master
Some bugfixes / Notices
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) { |