Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #43989 by darius: critical bugfix: removed debug code from profile module.

4.7.x
Dries Buytaert 2006-01-10 12:22:18 +00:00
parent afb923a00a
commit 08098a34f3
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/profile.module
View File

@ -207,7 +207,7 @@ function profile_browse() {
else { else {
// Compile a list of fields to show // Compile a list of fields to show
$fields = array(); $fields = array();
$result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY weight', PROFILE_PUBLIC_LISTINGS); $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY category, weight', PROFILE_PUBLIC_LISTINGS);
while ($record = db_fetch_object($result)) { while ($record = db_fetch_object($result)) {
$fields[] = $record; $fields[] = $record;
} }
@ -261,10 +261,6 @@ function profile_view_field($user, $field) {
// Only allow browsing of private fields for admins // Only allow browsing of private fields for admins
$browse = user_access('administer users') || $field->visibility != PROFILE_PRIVATE; $browse = user_access('administer users') || $field->visibility != PROFILE_PRIVATE;
if ($field->fid == 18 || $field->fid == 19 || $field->fid == 20) {
return;
}
if ($value = $user->{$field->name}) { if ($value = $user->{$field->name}) {
switch ($field->type) { switch ($field->type) {
case 'textfield': case 'textfield':

6
modules/profile/profile.module
View File

@ -207,7 +207,7 @@ function profile_browse() {
else { else {
// Compile a list of fields to show // Compile a list of fields to show
$fields = array(); $fields = array();
$result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY weight', PROFILE_PUBLIC_LISTINGS); $result = db_query('SELECT name, title, type, weight FROM {profile_fields} WHERE visibility = %d ORDER BY category, weight', PROFILE_PUBLIC_LISTINGS);
while ($record = db_fetch_object($result)) { while ($record = db_fetch_object($result)) {
$fields[] = $record; $fields[] = $record;
} }
@ -261,10 +261,6 @@ function profile_view_field($user, $field) {
// Only allow browsing of private fields for admins // Only allow browsing of private fields for admins
$browse = user_access('administer users') || $field->visibility != PROFILE_PRIVATE; $browse = user_access('administer users') || $field->visibility != PROFILE_PRIVATE;
if ($field->fid == 18 || $field->fid == 19 || $field->fid == 20) {
return;
}
if ($value = $user->{$field->name}) { if ($value = $user->{$field->name}) {
switch ($field->type) { switch ($field->type) {
case 'textfield': case 'textfield':