diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-05-25 13:42:56 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-05-25 13:42:56 +0000 |
commit | a98905f5c6696ef166ec797fc6ee80fe8f94f48f (patch) | |
tree | 8190afe432c33bf5756340bc432e84cdb5af4a1a /modules/profile | |
parent | 76957a25e6eb2ce82fc3f52f6f4f97be4748f6e6 (diff) | |
download | brdo-a98905f5c6696ef166ec797fc6ee80fe8f94f48f.tar.gz brdo-a98905f5c6696ef166ec797fc6ee80fe8f94f48f.tar.bz2 |
- Patch #471800 by stella: more code style fixes.
Diffstat (limited to 'modules/profile')
-rw-r--r-- | modules/profile/profile.module | 4 | ||||
-rw-r--r-- | modules/profile/profile.pages.inc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 0e97ef2bc..f1b4d0c8a 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -341,10 +341,10 @@ function profile_view_profile(&$user) { // Show private fields to administrators and people viewing their own account. if (user_access('administer users') || $GLOBALS['user']->uid == $user->uid) { - $result = db_query('SELECT * FROM {profile_field} WHERE visibility != %d ORDER BY category, weight', PROFILE_HIDDEN); + $result = db_query('SELECT * FROM {profile_field} WHERE visibility <> %d ORDER BY category, weight', PROFILE_HIDDEN); } else { - $result = db_query('SELECT * FROM {profile_field} WHERE visibility != %d AND visibility != %d ORDER BY category, weight', PROFILE_PRIVATE, PROFILE_HIDDEN); + $result = db_query('SELECT * FROM {profile_field} WHERE visibility <> %d AND visibility <> %d ORDER BY category, weight', PROFILE_PRIVATE, PROFILE_HIDDEN); } $fields = array(); diff --git a/modules/profile/profile.pages.inc b/modules/profile/profile.pages.inc index 7d1bd4a76..572d2365c 100644 --- a/modules/profile/profile.pages.inc +++ b/modules/profile/profile.pages.inc @@ -29,7 +29,7 @@ function profile_browse() { // Compile a list of fields to show. $fields = array(); - $result = db_query('SELECT name, title, type, weight, page FROM {profile_field} WHERE fid != %d AND visibility = %d ORDER BY weight', $field->fid, PROFILE_PUBLIC_LISTINGS); + $result = db_query('SELECT name, title, type, weight, page FROM {profile_field} WHERE fid <> %d AND visibility = %d ORDER BY weight', $field->fid, PROFILE_PUBLIC_LISTINGS); while ($record = db_fetch_object($result)) { $fields[] = $record; } @@ -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)->fetchAllAssoc('uid'); + $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)->fetchAllAssoc('uid'); // Load the users. $users = user_load_multiple(array_keys($result)); @@ -90,7 +90,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)->fetchAllAssoc('uid'); + $result = pager_query('SELECT uid, access FROM {users} WHERE uid > 0 AND status <> 0 AND access <> 0 ORDER BY access DESC', 20, 0, NULL)->fetchAllAssoc('uid'); $users = user_load_multiple(array_keys($result)); $content = ''; foreach ($users as $account) { |