Fixes #5232 handling empty profile url field

diff --git a/actions/profile/edit.php b/actions/profile/edit.php
index 63fb3160080ed1e6b95fddb76b34d99d1bd10208..b817463ac408fb2a68ece72d4c5bf207f1149d94 100644 (file)
--- 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 167f995ae5c109a9c7d3c0bc041312c2f7da41a4..15df6c2fd2aa10892660930fe1867177a4022e1a 100644 (file)
--- 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; ?>">