From 47c3e474becc94287e5afce4ec70992266e7ee6b Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 12 Jun 2008 15:53:24 -0400 Subject: only validate if values are sent darcs-hash:20080612195324-84dde-cab5efa3218f3cd3632ced1c819a5be2edb3c5a0.gz --- actions/updateprofile.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'actions') diff --git a/actions/updateprofile.php b/actions/updateprofile.php index e4382f674..16afba618 100644 --- a/actions/updateprofile.php +++ b/actions/updateprofile.php @@ -70,20 +70,20 @@ class UpdateprofileAction extends Action { return false; } $nickname = $req->get_parameter('omb_listenee_nickname'); - if (!Validate::string($nickname, array('min_length' => 1, - 'max_length' => 64, - 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) { + if ($nickname && !Validate::string($nickname, array('min_length' => 1, + 'max_length' => 64, + 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) { $this->client_error(_t('Nickname must have only letters and numbers and no spaces.')); return false; } - $profile_url = $req->get_parameter('omb_listenee_profile'); - if (!common_valid_http_url($profile_url)) { - $this->client_error(_t("Invalid profile URL '$profile_url'.")); + $license = $req->get_parameter('omb_listenee_license'); + if ($license && !common_valid_http_url($license)) { + $this->client_error(_t("Invalid license URL '$license'")); return false; } - $license = $req->get_parameter('omb_listenee_license'); - if (!common_valid_http_url($license)) { - $this->client_error(_t("Invalid license URL '$license'.")); + $profile_url = $req->get_parameter('omb_listenee_profile'); + if ($profile_url && !common_valid_http_url($profile_url)) { + $this->client_error(_t("Invalid profile URL '$profile_url'.")); return false; } # optional stuff -- cgit v1.2.3-54-g00ecf