adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix php warning from comment_list.tpl

Browse Source 
- author name is saved always in #comments (even for registered users) so that
  - sql queries are simpler on the comments page (one less table in a big join)
  - when a user is deleted, we can keep the username in the #comments (there might be still a bug that author_id is not updated when a user is deleted)

git-svn-id: http://piwigo.org/svn/trunk@3600 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2009-07-16 05:20:34 +00:00
parent c57fa7e7e3
commit e618e8b944
3 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
comments.php
+2 -20
View File
@@ -87,7 +87,7 @@ if (isset($_GET['items_number']))
{
$page['items_number'] = $_GET['items_number'];
}
if ( !is_numeric($page['items_number']) and $page['items_number']!='all' )
if ( !is_numeric($page['items_number']) and $page['items_number']!='all' )
{
$page['items_number'] = 10;
}
@@ -271,8 +271,6 @@ SELECT COUNT(DISTINCT(com.id))
FROM '.IMAGE_CATEGORY_TABLE.' AS ic
INNER JOIN '.COMMENTS_TABLE.' AS com
ON ic.image_id = com.image_id
LEFT JOIN '.USERS_TABLE.' As u
ON u.'.$conf['user_fields']['id'].' = com.author_id
WHERE '.implode('
AND ', $page['where_clauses']).'
;';
@@ -304,15 +302,12 @@ SELECT com.id AS comment_id
, ic.category_id
, com.author
, com.author_id
, '.$conf['user_fields']['username'].' AS username
, com.date
, com.content
, com.validated
FROM '.IMAGE_CATEGORY_TABLE.' AS ic
INNER JOIN '.COMMENTS_TABLE.' AS com
ON ic.image_id = com.image_id
LEFT JOIN '.USERS_TABLE.' AS u
ON u.'.$conf['user_fields']['id'].' = com.author_id
WHERE '.implode('
AND ', $page['where_clauses']).'
GROUP BY comment_id
@@ -378,25 +373,12 @@ SELECT id, name, permalink, uppercats
)
);
if (!empty($comment['author']))
{
$author = $comment['author'];
if ($author == 'guest')
{
$author = l10n('guest');
}
}
else
{
$author = $comment['username'];
}
$tpl_comment =
array(
'U_PICTURE' => $url,
'TN_SRC' => $thumbnail_src,
'ALT' => $name,
'AUTHOR' => trigger_event('render_comment_author', $author),
'AUTHOR' => trigger_event('render_comment_author', $comment['author']),
'DATE'=>format_date($comment['date'], true),
'CONTENT'=>trigger_event('render_comment_content',$comment['content']),
);