Cosmetic changes to common_redirect, clientError, serverError

[quix0rs-gnu-social.git] / plugins / ExtendedProfile / actions / profiledetailsettings.php

diff --git a/plugins/ExtendedProfile/actions/profiledetailsettings.php b/plugins/ExtendedProfile/actions/profiledetailsettings.php
index 1cf70034735579c9cc6a5ee6fe965f05f4aac18f..8d8a33ec4493e03b84541b8223e875971442a8bd 100644 (file)
--- a/plugins/ExtendedProfile/actions/profiledetailsettings.php
+++ b/plugins/ExtendedProfile/actions/profiledetailsettings.php
@@ -267,10 +267,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
         $this->removeAll($user, 'website');
         $i = 0;
         foreach($sites as $site) {
-            if (!empty($site['value']) && !Validate::uri(
-                $site['value'],
-                array('allowed_schemes' => array('http', 'https')))
-            ) {
+            if (!empty($site['value']) && !common_valid_http_url($site['value'])) {
                 // TRANS: Exception thrown when entering an invalid URL.
                 // TRANS: %s is the invalid URL.
                 throw new Exception(sprintf(_m('Invalid URL: %s.'), $site['value']));
@@ -623,7 +620,6 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
                 common_log_db_error($profile, 'UPDATE', __FILE__);
                 // TRANS: Server error thrown when user profile settings could not be saved.
                 $this->serverError(_m('Could not save profile.'));
-                return;
             }
 
             // Set the user tags
@@ -632,11 +628,9 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
             if (!$result) {
                 // TRANS: Server error thrown when user profile settings tags could not be saved.
                 $this->serverError(_m('Could not save tags.'));
-                return;
             }
 
             Event::handle('EndProfileSaveForm', array($this));
-            common_broadcast_profile($profile);
         }
     }