diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-02-16 15:29:46 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-02-16 15:29:46 +0000 |
| commit | eeae26b227b4b4fdf44f0242a003edf7cc7c7c46 (patch) | |
| tree | 381d74c3477915bb21037c07a8b9d438d27daea1 | |
| parent | ae470d6943c39a6cdc81ee782fc296bce8a41dbe (diff) | |
| download | brdo-eeae26b227b4b4fdf44f0242a003edf7cc7c7c46.tar.gz brdo-eeae26b227b4b4fdf44f0242a003edf7cc7c7c46.tar.bz2 | |
- Patch #49132 by Tobias and Zen: fixed problem with profile fields being mangled.
| -rw-r--r-- | modules/profile.module | 2 | ||||
| -rw-r--r-- | modules/profile/profile.module | 2 | ||||
| -rw-r--r-- | modules/user.module | 8 | ||||
| -rw-r--r-- | modules/user/user.module | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/modules/profile.module b/modules/profile.module index 0e563b2bf..66596806a 100644 --- a/modules/profile.module +++ b/modules/profile.module @@ -314,7 +314,7 @@ function profile_view_profile($user) { while ($field = db_fetch_object($result)) { if ($value = profile_view_field($user, $field)) { $description = ($field->visibility == PROFILE_PRIVATE) ? t('The content of this field is private and only visible to yourself.') : ''; - $title = ($field->type != 'checkbox') ? check_plain($field->title) : ''; + $title = ($field->type != 'checkbox') ? check_plain($field->title) : NULL; $item = array('title' => $title, 'value' => $value, 'class' => $field->name, diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 0e563b2bf..66596806a 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -314,7 +314,7 @@ function profile_view_profile($user) { while ($field = db_fetch_object($result)) { if ($value = profile_view_field($user, $field)) { $description = ($field->visibility == PROFILE_PRIVATE) ? t('The content of this field is private and only visible to yourself.') : ''; - $title = ($field->type != 'checkbox') ? check_plain($field->title) : ''; + $title = ($field->type != 'checkbox') ? check_plain($field->title) : NULL; $item = array('title' => $title, 'value' => $value, 'class' => $field->name, diff --git a/modules/user.module b/modules/user.module index 9558b7c3e..b641e81bc 100644 --- a/modules/user.module +++ b/modules/user.module @@ -642,22 +642,22 @@ function theme_user_picture($account) { * @ingroup themeable */ function theme_user_profile($account, $fields) { - $output = "<div class=\"profile\">\n"; + $output = '<div class="profile">'; $output .= theme('user_picture', $account); foreach ($fields as $category => $items) { if (strlen($category) > 0) { - $output .= '<h2 class="title">'. $category ."</h2>\n"; + $output .= '<h2 class="title">'. $category .'</h2>'; } $output .= '<dl>'; foreach ($items as $item) { if (isset($item['title'])) { - $output .= '<dt class="'. $item['class'] .'">'. $item['title'] .':</dt>'; + $output .= '<dt class="'. $item['class'] .'">'. $item['title'] .'</dt>'; } $output .= '<dd class="'. $item['class'] .'">'. $item['value'] .'</dd>'; } $output .= '</dl>'; } - $output .= "</div>\n"; + $output .= '</div>'; return $output; } diff --git a/modules/user/user.module b/modules/user/user.module index 9558b7c3e..b641e81bc 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -642,22 +642,22 @@ function theme_user_picture($account) { * @ingroup themeable */ function theme_user_profile($account, $fields) { - $output = "<div class=\"profile\">\n"; + $output = '<div class="profile">'; $output .= theme('user_picture', $account); foreach ($fields as $category => $items) { if (strlen($category) > 0) { - $output .= '<h2 class="title">'. $category ."</h2>\n"; + $output .= '<h2 class="title">'. $category .'</h2>'; } $output .= '<dl>'; foreach ($items as $item) { if (isset($item['title'])) { - $output .= '<dt class="'. $item['class'] .'">'. $item['title'] .':</dt>'; + $output .= '<dt class="'. $item['class'] .'">'. $item['title'] .'</dt>'; } $output .= '<dd class="'. $item['class'] .'">'. $item['value'] .'</dd>'; } $output .= '</dl>'; } - $output .= "</div>\n"; + $output .= '</div>'; return $output; } |