fix validation of url

darcs-hash:20080520192634-84dde-2394dbf8767ff886817a5f20f5c9064ea3a1bc79.gz

1 files changed, 2 insertions, 8 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index f06b21d6c..f742d4326 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -43,14 +43,8 @@ class Notice extends DB_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-	// XXX: if profile_id changes, this goes invalid. To be fair, that's a very edge case
-	static $profile;
-
 	function getProfile() {
-		if (!$this->profile) {
-			$this->profile = Profile::staticGet($this->profile_id);
-		}
-		return $this->profile;
+		return Profile::staticGet($this->profile_id);
 	}
 
 	function validateContent() {
@@ -58,7 +52,7 @@ class Notice extends DB_DataObject
 	}
 
 	function validateUrl() {
-		return is_null($this->url) ||
+		return is_null($this->url) || (strlen($this->url) == 0) ||
 		  Validate::uri($this->url, array('allowed_schemes' => array('http', 'https')));
 	}
 }