diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-18 15:19:57 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-18 15:19:57 +0000 |
| commit | ff9e842730ccf251cf8b76401e4df1b1c6edcea2 (patch) | |
| tree | 2b10ab740305648bee997708b6d651a3816e3545 /modules/dblog | |
| parent | df591c8f4032041613192e1b7836725f92ea7b10 (diff) | |
| download | brdo-ff9e842730ccf251cf8b76401e4df1b1c6edcea2.tar.gz brdo-ff9e842730ccf251cf8b76401e4df1b1c6edcea2.tar.bz2 | |
#330983 by recidive and boombatower: Rename users/users_roles tables to user/user_role for consistency.
Diffstat (limited to 'modules/dblog')
| -rw-r--r-- | modules/dblog/dblog.admin.inc | 4 | ||||
| -rw-r--r-- | modules/dblog/dblog.install | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/dblog/dblog.admin.inc b/modules/dblog/dblog.admin.inc index 921fb7c4d..870c78c1c 100644 --- a/modules/dblog/dblog.admin.inc +++ b/modules/dblog/dblog.admin.inc @@ -63,7 +63,7 @@ function dblog_overview() { array('data' => t('Operations')), ); - $sql = "SELECT w.wid, w.uid, w.severity, w.type, w.timestamp, w.message, w.variables, w.link, u.name FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid"; + $sql = "SELECT w.wid, w.uid, w.severity, w.type, w.timestamp, w.message, w.variables, w.link, u.name FROM {watchdog} w INNER JOIN {user} u ON w.uid = u.uid"; $tablesort = tablesort_sql($header); if (!empty($filter['where'])) { $result = pager_query($sql . " WHERE " . $filter['where'] . $tablesort, 50, 0, NULL, $filter['args']); @@ -132,7 +132,7 @@ function dblog_top($type) { function dblog_event($id) { $severity = watchdog_severity_levels(); $output = ''; - $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid WHERE w.wid = %d', $id); + $result = db_query('SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {user} u ON w.uid = u.uid WHERE w.wid = %d', $id); if ($dblog = db_fetch_object($result)) { $rows = array( array( diff --git a/modules/dblog/dblog.install b/modules/dblog/dblog.install index a1dbbf344..0d3e2e363 100644 --- a/modules/dblog/dblog.install +++ b/modules/dblog/dblog.install @@ -33,7 +33,7 @@ function dblog_schema() { 'type' => 'int', 'not null' => TRUE, 'default' => 0, - 'description' => 'The {users}.uid of the user who triggered the event.', + 'description' => 'The {user}.uid of the user who triggered the event.', ), 'type' => array( 'type' => 'varchar', |