diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-15 17:29:38 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-15 17:29:38 -0700 |
| commit | 80eb84e843cdca51bbf4ebda180f4de41351b9c4 (patch) | |
| tree | d6cd7012210477c6e17322b2d19b8a1aad61ca44 /mod/photos.php | |
| parent | e4880d07d2aa447425d0b7dc3656e84de08006c0 (diff) | |
| parent | 1eb478ba54206cca53653e7a579aa1a36fb03315 (diff) | |
| download | volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.tar.gz volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.tar.bz2 volse-hubzilla-80eb84e843cdca51bbf4ebda180f4de41351b9c4.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mod/photos.php b/mod/photos.php index dc593f22b..2b859b7f1 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -999,7 +999,7 @@ function photos_content(&$a) { $comments = ''; if(! count($r)) { if($can_post || $can_comment) { - $comments .= replace_macros($cmnt_tpl,array( + $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', '$mode' => 'photos', '$jsreload' => $return_url, @@ -1070,7 +1070,7 @@ function photos_content(&$a) { $body_e = prepare_text($item['body'],$item['mimetype']); $comments .= replace_macros($template,array( - '$id' => $item['item_id'], + '$id' => $item['id'], '$mode' => 'photos', '$profile_url' => $profile_link, '$name' => $name_e, @@ -1079,7 +1079,7 @@ function photos_content(&$a) { '$title' => $title_e, '$body' => $body_e, '$ago' => relative_date($item['created']), - '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$indent' => (($item['parent'] != $item['id']) ? ' comment' : ''), '$drop' => $drop, '$comment' => $comment )); @@ -1087,7 +1087,7 @@ function photos_content(&$a) { } if($can_post || $can_comment) { - $comments .= replace_macros($cmnt_tpl,array( + $commentbox = replace_macros($cmnt_tpl,array( '$return_path' => '', '$jsreload' => $return_url, '$type' => 'wall-comment', @@ -1129,6 +1129,7 @@ function photos_content(&$a) { '$like' => $like_e, '$dislike' => $dislike_e, '$comments' => $comments, + '$commentbox' => $commentbox, '$paginate' => $paginate, )); |