X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice.php;h=a00114f95df2043db1a0258c7c009ceb629e6352;hb=48ac5b9e85f48b2adfb34209a26d1119fdeaf172;hp=f06b21d6c6e067e8eec09810fb17e3310db0c789;hpb=52600ce0b063e68e622b19699841e41b5ddbf2d1;p=quix0rs-gnu-social.git

diff --git a/classes/Notice.php b/classes/Notice.php
index f06b21d6c6..a00114f95d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -24,7 +24,7 @@ if (!defined('LACONICA')) { exit(1); }
  */
 require_once 'DB/DataObject.php';
 
-class Notice extends DB_DataObject
+class Notice extends DB_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -32,10 +32,13 @@ class Notice extends DB_DataObject
     public $__table = 'notice';                          // table name
     public $id;                              // int(4)  primary_key not_null
     public $profile_id;                      // int(4)   not_null
-    public $content;                         // varchar(140)
-    public $url;                             // varchar(255)
+    public $uri;                             // varchar(255)  unique_key
+    public $content;                         // varchar(140)  
+    public $rendered;                        // text()  
+    public $url;                             // varchar(255)  
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+    public $reply_to;                        // int(4)  
 
     /* Static get */
     function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Notice',$k,$v); }
@@ -43,22 +46,7 @@ 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;
-	}
-
-	function validateContent() {
-		return Validate::string($this->content, array('min_length' => 1, 'max_length' => 140));
-	}
-
-	function validateUrl() {
-		return is_null($this->url) ||
-		  Validate::uri($this->url, array('allowed_schemes' => array('http', 'https')));
+		return Profile::staticGet($this->profile_id);
 	}
 }