aboutsummaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorShashi Gowda <connect2shashi@gmail.com>2011-03-22 07:56:25 +0530
committerShashi Gowda <connect2shashi@gmail.com>2011-03-22 07:56:25 +0530
commit31c1177970124cee31823cab3a11542c23b4126d (patch)
tree9ca2aa173877629e48995ce3085649db2c810056 /db
parent894d4ba16f28a4bdd274378d9669d76a717eec31 (diff)
parent0a71622aa731c62c89ba84ef86d21fd168521ee1 (diff)
downloadgnu-social-31c1177970124cee31823cab3a11542c23b4126d.tar
gnu-social-31c1177970124cee31823cab3a11542c23b4126d.zip
Merge branch '1.0.x' into people_tags_rebase
Conflicts: EVENTS.txt actions/peopletag.php actions/tagother.php classes/Notice.php js/util.js js/util.min.js lib/accountprofileblock.php lib/action.php lib/activityobject.php lib/command.php lib/personalgroupnav.php plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'db')
-rw-r--r--db/core.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/core.php b/db/core.php
index 9f9c7a24bb..cfed063a59 100644
--- a/db/core.php
+++ b/db/core.php
@@ -201,6 +201,7 @@ $schema['notice'] = array(
'location_id' => array('type' => 'int', 'description' => 'location id if possible'),
'location_ns' => array('type' => 'int', 'description' => 'namespace for location'),
'repeat_of' => array('type' => 'int', 'description' => 'notice this is a repeat of'),
+ 'object_type' => array('type' => 'varchar', 'length' => 255, 'description' => 'URI representing activity streams object type', 'default' => 'http://activitystrea.ms/schema/1.0/note'),
),
'primary key' => array('id'),
'unique keys' => array(