From ff9e842730ccf251cf8b76401e4df1b1c6edcea2 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Wed, 18 Feb 2009 15:19:57 +0000 Subject: #330983 by recidive and boombatower: Rename users/users_roles tables to user/user_role for consistency. --- modules/dblog/dblog.admin.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/dblog/dblog.admin.inc') 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( -- cgit v1.2.3