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

bug 1579: admins should see all user comments on picture.php, validated or not.

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@5654 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-04-04 22:50:12 +00:00
parent 80067101ca
commit dd843c7823
1 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/picture_comment.inc.php
+25 -15
View File
@@ -88,11 +88,23 @@ elseif ( isset($_POST['content']) )
if ($page['show_comments'])
{
if ( !is_admin() )
{
$validated_clause = ' AND validated = \'true\'';
}
else
{
$validated_clause = '';
}
// number of comments for this picture
$query = '
SELECT COUNT(*) AS nb_comments
SELECT
COUNT(*) AS nb_comments
FROM '.COMMENTS_TABLE.'
WHERE image_id='.$page['image_id']." AND validated = 'true'";
WHERE image_id = '.$page['image_id']
.$validated_clause.'
;';
$row = pwg_db_fetch_assoc( pwg_query( $query ) );
// navigation bar creation
@@ -118,23 +130,21 @@ SELECT COUNT(*) AS nb_comments
if ($row['nb_comments'] > 0)
{
if ( !is_admin() )
{
$validated_clause = ' AND validated = \'true\'';
}
else
{
$validated_clause = '';
}
$query = '
SELECT com.id,author,author_id,'.$conf['user_fields']['username'].' AS username,
date,image_id,content,validated
SELECT
com.id,
author,
author_id,
'.$conf['user_fields']['username'].' AS username,
date,
image_id,
content,
validated
FROM '.COMMENTS_TABLE.' AS com
LEFT JOIN '.USERS_TABLE.' AS u
ON u.'.$conf['user_fields']['id'].' = author_id
WHERE image_id = '.$page['image_id'].
$validated_clause.'
WHERE image_id = '.$page['image_id'].'
'.$validated_clause.'
ORDER BY date ASC
LIMIT '.$conf['nb_comment_page'].' OFFSET '.$page['start'].'
;';