Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #58921 by markus_petrux: critical bug: database error when rendering comments in PostgreSQL. 

Tested with MySQL only!
4.7.x
Dries Buytaert 2006-04-17 20:45:00 +00:00
parent 54a47afd20
commit 0484fcd1ed
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/comment.module
View File

@ -120,7 +120,7 @@ function comment_menu($may_cache) {
$items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'), $items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
$items[] = array('path' => 'comment/delete', 'title' => t('delete comment'), $items[] = array('path' => 'comment/delete', 'title' => t('delete comment'),
'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK); 'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK);
@ -732,7 +732,7 @@ function comment_render($node, $cid = 0) {
$query .= ' AND c.status = %d'; $query .= ' AND c.status = %d';
$query_args[] = COMMENT_PUBLISHED; $query_args[] = COMMENT_PUBLISHED;
} }
$query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users'; $query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.status';
$result = db_query($query, $query_args); $result = db_query($query, $query_args);
if ($comment = db_fetch_object($result)) { if ($comment = db_fetch_object($result)) {
@ -752,7 +752,7 @@ function comment_render($node, $cid = 0) {
$query_args[] = COMMENT_PUBLISHED; $query_args[] = COMMENT_PUBLISHED;
} }
$query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread'; $query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread, c.status';
/* /*
** We want to use the standard pager, but threads would need every ** We want to use the standard pager, but threads would need every

6
modules/comment/comment.module
View File

@ -120,7 +120,7 @@ function comment_menu($may_cache) {
$items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'), $items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
$items[] = array('path' => 'comment/delete', 'title' => t('delete comment'), $items[] = array('path' => 'comment/delete', 'title' => t('delete comment'),
'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK); 'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK);
@ -732,7 +732,7 @@ function comment_render($node, $cid = 0) {
$query .= ' AND c.status = %d'; $query .= ' AND c.status = %d';
$query_args[] = COMMENT_PUBLISHED; $query_args[] = COMMENT_PUBLISHED;
} }
$query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users'; $query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.status';
$result = db_query($query, $query_args); $result = db_query($query, $query_args);
if ($comment = db_fetch_object($result)) { if ($comment = db_fetch_object($result)) {
@ -752,7 +752,7 @@ function comment_render($node, $cid = 0) {
$query_args[] = COMMENT_PUBLISHED; $query_args[] = COMMENT_PUBLISHED;
} }
$query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread'; $query .= ' GROUP BY c.cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, u.picture, c.homepage, u.uid, u.name, u.picture, u.data, c.score, c.users, c.thread, c.status';
/* /*
** We want to use the standard pager, but threads would need every ** We want to use the standard pager, but threads would need every