Notice saves its object type

diff --git a/classes/Notice.php b/classes/Notice.php
index 157fdf2dc466c698233118994b75a67718e34f22..7be63b4e9f917a29676556e4187e1cbb46587d0f 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -72,6 +72,7 @@ class Notice extends Memcached_DataObject
     public $location_id;                     // int(4)
     public $location_ns;                     // int(4)
     public $repeat_of;                       // int(4)
+    public $object_type;                     // varchar(255)
 
     /* Static get */
     function staticGet($k,$v=NULL)
@@ -241,6 +242,7 @@ class Notice extends Memcached_DataObject
      *              array 'urls' list of attached/referred URLs to save with the
      *                           notice in place of extracting links from content
      *              boolean 'distribute' whether to distribute the notice, default true
+     *              string 'object_type' URL of the associated object type (default ActivityObject::NOTE)
      *
      * @fixme tag override
      *
@@ -360,6 +362,12 @@ class Notice extends Memcached_DataObject
             $notice->rendered = common_render_content($final, $notice);
         }
 
+        if (empty($object_type)) {
+            $notice->object_type = ActivityObject::NOTE;
+        } else {
+            $notice->object_type = $object_type;
+        }
+
         if (Event::handle('StartNoticeSave', array(&$notice))) {
 
             // XXX: some of these functions write to the DB

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index bf8d173805b9b50446769dded95c242a46d451db..338e5c5aeaace0486b78f87b1047e049df583e8e 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -336,6 +336,7 @@ lon = 1
 location_id = 1
 location_ns = 1
 repeat_of = 1
+object_type = 2
 
 [notice__keys]
 id = N