diff options
| author | Cash Costello <cash.costello@gmail.com> | 2013-03-20 21:00:41 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2013-03-20 21:00:41 -0400 |
| commit | 4da579033674ecdb134bc921f3f0666072419e6c (patch) | |
| tree | 1752448a3d08934e3981c91019e95d809a819356 | |
| parent | b6544809afa82fb1da9e5f8a98dc4e2520bb35f0 (diff) | |
| download | elgg-4da579033674ecdb134bc921f3f0666072419e6c.tar.gz elgg-4da579033674ecdb134bc921f3f0666072419e6c.tar.bz2 | |
Fixes #5232 handling empty profile url field
| -rw-r--r-- | actions/profile/edit.php | 2 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/details.php | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/actions/profile/edit.php b/actions/profile/edit.php index 63fb31600..b817463ac 100644 --- a/actions/profile/edit.php +++ b/actions/profile/edit.php @@ -48,7 +48,7 @@ foreach ($profile_fields as $shortname => $valuetype) { forward(REFERER); } - if ($valuetype == 'url' && !preg_match('~^https?\://~i', $value)) { + if ($value && $valuetype == 'url' && !preg_match('~^https?\://~i', $value)) { $value = "http://$value"; } diff --git a/mod/profile/views/default/profile/details.php b/mod/profile/views/default/profile/details.php index 167f995ae..15df6c2fd 100644 --- a/mod/profile/views/default/profile/details.php +++ b/mod/profile/views/default/profile/details.php @@ -22,13 +22,13 @@ if (is_array($profile_fields) && sizeof($profile_fields) > 0) { } $value = $user->$shortname; - // validate urls - if ($valtype == 'url' && !preg_match('~^https?\://~i', $value)) { - $value = "http://$value"; - } - if (!empty($value)) { - //This function controls the alternating class + // validate urls + if ($valtype == 'url' && !preg_match('~^https?\://~i', $value)) { + $value = "http://$value"; + } + + // this controls the alternating class $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; ?> <div class="<?php echo $even_odd; ?>"> |