loosen restrictions on names for atlinks

[quix0rs-gnu-social.git] / classes / Notice.php

diff --git a/classes/Notice.php b/classes/Notice.php
index a25afce2b975d7bf53e31a8f9f05d10b0c36113b..24a719104fc9a263e8b08feaa2046cb8b403d551 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1,6 +1,23 @@
 <?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-if (!defined('MICROBLOG')) { exit(1) }
+if (!defined('LACONICA')) { exit(1); }
 
 /**
  * Table Definition for notice
@@ -15,8 +32,8 @@ 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 $uri;                             // varchar(255)  unique_key
     public $content;                         // varchar(140)  
-    public $rendered;                        // varchar(140)  
     public $url;                             // varchar(255)  
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -27,13 +44,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;
+               return Profile::staticGet($this->profile_id);
        }
 }