diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-26 07:30:29 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-26 07:30:29 +0000 |
| commit | 665c9fdc2ca50f7960c16b375685485b3eb8b1cc (patch) | |
| tree | 273088dccb033efaf0e7ed718e6041842e32c7ae /modules/poll | |
| parent | 116de1793300f2aee3d71297c26ec448f8141196 (diff) | |
| download | brdo-665c9fdc2ca50f7960c16b375685485b3eb8b1cc.tar.gz brdo-665c9fdc2ca50f7960c16b375685485b3eb8b1cc.tar.bz2 | |
Roll-back of users -> user table name change in #330983: Broken pgsql is no fun.
Diffstat (limited to 'modules/poll')
| -rw-r--r-- | modules/poll/poll.install | 6 | ||||
| -rw-r--r-- | modules/poll/poll.pages.inc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/poll/poll.install b/modules/poll/poll.install index e1bd72c60..04b7ad5a5 100644 --- a/modules/poll/poll.install +++ b/modules/poll/poll.install @@ -92,13 +92,13 @@ function poll_schema() { ); $schema['poll_vote'] = array( - 'description' => 'Stores per-{user} votes for each {poll}.', + 'description' => 'Stores per-{users} votes for each {poll}.', 'fields' => array( 'chid' => array( 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, - 'description' => "The {user}'s vote for this poll.", + 'description' => "The {users}'s vote for this poll.", ), 'nid' => array( 'type' => 'int', @@ -111,7 +111,7 @@ function poll_schema() { 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, - 'description' => 'The {user}.uid this vote is from unless the voter was anonymous.', + 'description' => 'The {users}.uid this vote is from unless the voter was anonymous.', ), 'hostname' => array( 'type' => 'varchar', diff --git a/modules/poll/poll.pages.inc b/modules/poll/poll.pages.inc index c1e112f53..4851b9987 100644 --- a/modules/poll/poll.pages.inc +++ b/modules/poll/poll.pages.inc @@ -35,7 +35,7 @@ function poll_votes($node) { $header[] = array('data' => t('Vote'), 'field' => 'pc.chtext'); $header[] = array('data' => t('Timestamp'), 'field' => 'pv.timestamp', 'sort' => 'desc'); - $result = pager_query("SELECT pv.chid, pv.uid, pv.hostname, pv.timestamp, pv.nid, pc.chtext, u.name FROM {poll_vote} pv INNER JOIN {poll_choice} pc ON pv.chid = pc.chid LEFT JOIN {user} u ON pv.uid = u.uid WHERE pv.nid = %d". tablesort_sql($header), 20, 0, NULL, $node->nid); + $result = pager_query("SELECT pv.chid, pv.uid, pv.hostname, pv.timestamp, pv.nid, pc.chtext, u.name FROM {poll_vote} pv INNER JOIN {poll_choice} pc ON pv.chid = pc.chid LEFT JOIN {users} u ON pv.uid = u.uid WHERE pv.nid = %d". tablesort_sql($header), 20, 0, NULL, $node->nid); $rows = array(); while ($vote = db_fetch_object($result)) { $rows[] = array( |