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/profile | |
| 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/profile')
| -rw-r--r-- | modules/profile/profile.admin.inc | 2 | ||||
| -rw-r--r-- | modules/profile/profile.install | 2 | ||||
| -rw-r--r-- | modules/profile/profile.pages.inc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/profile/profile.admin.inc b/modules/profile/profile.admin.inc index e0252ce10..b7ee8b2cf 100644 --- a/modules/profile/profile.admin.inc +++ b/modules/profile/profile.admin.inc @@ -294,7 +294,7 @@ function profile_field_form_validate($form, &$form_state) { form_set_error('name', t('The specified form name contains one or more illegal characters. Spaces or any other special characters except dash (-) and underscore (_) are not allowed.')); } - $users_table = drupal_get_schema('users'); + $users_table = drupal_get_schema('user'); if (!empty($users_table['fields'][$form_state['values']['name']])) { form_set_error('name', t('The specified form name is reserved for use by Drupal.')); } diff --git a/modules/profile/profile.install b/modules/profile/profile.install index a4c1fd24f..e081383e9 100644 --- a/modules/profile/profile.install +++ b/modules/profile/profile.install @@ -132,7 +132,7 @@ function profile_schema() { 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, - 'description' => 'The {users}.uid of the profile user.', + 'description' => 'The {user}.uid of the profile user.', ), 'value' => array( 'type' => 'text', diff --git a/modules/profile/profile.pages.inc b/modules/profile/profile.pages.inc index 9cb761a28..bd14dac85 100644 --- a/modules/profile/profile.pages.inc +++ b/modules/profile/profile.pages.inc @@ -55,7 +55,7 @@ function profile_browse() { } // Extract the affected users: - $result = pager_query("SELECT u.uid, u.access FROM {users} u INNER JOIN {profile_value} v ON u.uid = v.uid WHERE v.fid = %d AND $query AND u.access != 0 AND u.status != 0 ORDER BY u.access DESC", 20, 0, NULL, $arguments); + $result = pager_query("SELECT u.uid, u.access FROM {user} u INNER JOIN {profile_value} v ON u.uid = v.uid WHERE v.fid = %d AND $query AND u.access != 0 AND u.status != 0 ORDER BY u.access DESC", 20, 0, NULL, $arguments); $content = ''; while ($account = db_fetch_object($result)) { @@ -88,7 +88,7 @@ function profile_browse() { } // Extract the affected users: - $result = pager_query('SELECT uid, access FROM {users} WHERE uid > 0 AND status != 0 AND access != 0 ORDER BY access DESC', 20, 0, NULL); + $result = pager_query('SELECT uid, access FROM {user} WHERE uid > 0 AND status != 0 AND access != 0 ORDER BY access DESC', 20, 0, NULL); $content = ''; while ($account = db_fetch_object($result)) { |