diff options
| author | pafcu <pafcu@iki.fi> | 2014-10-16 16:06:20 +0300 |
|---|---|---|
| committer | pafcu <pafcu@iki.fi> | 2014-10-16 16:06:20 +0300 |
| commit | 865f804cfb86f12573ece550e1a7cf28172f6749 (patch) | |
| tree | 5484d212498eea4ab0e98e531dc06d5623cb8364 /mod/photos.php | |
| parent | aa0aa22b8ad5db1589331e985e82781949985269 (diff) | |
| parent | e1f88fd15d75f81af5017860b9f197771326c9b7 (diff) | |
| download | volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.tar.gz volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.tar.bz2 volse-hubzilla-865f804cfb86f12573ece550e1a7cf28172f6749.zip | |
Merge pull request #1 from friendica/master
Sync with upstream
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, )); |