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

fixes #877, avoid conflict with custom user table

Browse Source
This commit is contained in:
plegall
2018-07-11 11:48:20 +02:00
parent 69345c06e2
commit 86c34737ba
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/picture_comment.inc.php
+9 -9
View File
@@ -142,21 +142,21 @@ SELECT
$query = ' $query = '
SELECT SELECT
com.id, com.id,
author, com.author,
author_id, com.author_id,
u.'.$conf['user_fields']['email'].' AS user_email, u.'.$conf['user_fields']['email'].' AS user_email,
date, com.date,
image_id, com.image_id,
website_url, com.website_url,
com.email, com.email,
content, com.content,
validated com.validated
FROM '.COMMENTS_TABLE.' AS com FROM '.COMMENTS_TABLE.' AS com
LEFT JOIN '.USERS_TABLE.' AS u LEFT JOIN '.USERS_TABLE.' AS u
ON u.'.$conf['user_fields']['id'].' = author_id ON u.'.$conf['user_fields']['id'].' = author_id
WHERE image_id = '.$page['image_id'].' WHERE com.image_id = '.$page['image_id'].'
'.$validated_clause.' '.$validated_clause.'
ORDER BY date '.$comments_order.' ORDER BY com.date '.$comments_order.'
LIMIT '.$conf['nb_comment_page'].' OFFSET '.$page['start'].' LIMIT '.$conf['nb_comment_page'].' OFFSET '.$page['start'].'
;'; ;';
$result = pwg_query( $query ); $result = pwg_query( $query );