summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-12-22 12:05:40 -0800
committerEvan Prodromou <evan@status.net>2010-12-22 12:05:40 -0800
commite11ca1e0521a3fa305b6e4e70649690569766a11 (patch)
treea1eb743c8d09cca5f1d516db292d9fd04edfafc9
parenta01742244e192bf8a251f8e11404a4d56364b87b (diff)
parent448dfb69d433c2e244b32ef1ba0af48b6d91ca23 (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
-rw-r--r--lib/activityobject.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/activityobject.php b/lib/activityobject.php
index fc7da7ee8..b86e6a984 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -105,6 +105,7 @@ class ActivityObject
public $thumbnail;
public $largerImage;
public $description;
+ public $extra = array();
// Extra stuff, that may need to be serialized