diff options
| author | mistic100 <mistic@piwigo.org> | 2011-06-04 21:07:27 +0000 |
|---|---|---|
| committer | mistic100 <mistic@piwigo.org> | 2011-06-04 21:07:27 +0000 |
| commit | 24139d6e59b9f4ac321dc9ae978007f158b2ad01 (patch) | |
| tree | 926b163db227897d5fb95ac8718401ca9478f590 | |
| parent | ee24fc26a5a86d1db91e5d5b61202e2da8519475 (diff) | |
merge r11236 from trunk
transmit comment ID to template on comments and picture_comment
git-svn-id: http://piwigo.org/svn/branches/2.2@11237 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | comments.php | 1 | ||||
| -rw-r--r-- | include/picture_comment.inc.php | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/comments.php b/comments.php index 3fbeef8bb..27bc4975a 100644 --- a/comments.php +++ b/comments.php @@ -462,6 +462,7 @@ SELECT c.id, name, permalink, uppercats, com.id as comment_id ); $tpl_comment = array( + 'ID' => $comment_id, 'U_PICTURE' => $url, 'TN_SRC' => $thumbnail_src, 'ALT' => $name, diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php index e40a11f09..ec92594e8 100644 --- a/include/picture_comment.inc.php +++ b/include/picture_comment.inc.php @@ -167,10 +167,9 @@ SELECT $tpl_comment = array( + 'ID' => $row['id'], 'AUTHOR' => trigger_event('render_comment_author', $author), - - 'DATE' => format_date( $row['date'], true), - + 'DATE' => format_date($row['date'], true), 'CONTENT' => trigger_event('render_comment_content',$row['content']), ); |