diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-19 16:55:24 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-19 16:55:24 -0500 |
| commit | d69f6dff6a0b62ddab929f6ba0801533a9031162 (patch) | |
| tree | 2b49953ca2b5306a512f90e5d780cbe07d225b3c /plugins/OStatus/classes/FeedSub.php | |
| parent | b0327506a491f029b239ae703e1acb1d42ae299c (diff) | |
| parent | a1a3ab1c58cf8636c4e9ac6b9d44bdc18946a547 (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Conflicts:
plugins/OStatus/actions/salmon.php
Diffstat (limited to 'plugins/OStatus/classes/FeedSub.php')
| -rw-r--r-- | plugins/OStatus/classes/FeedSub.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php index dc2c0b710..bf9d063fa 100644 --- a/plugins/OStatus/classes/FeedSub.php +++ b/plugins/OStatus/classes/FeedSub.php @@ -99,7 +99,7 @@ class FeedSub extends Memcached_DataObject 'sub_state' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, 'sub_start' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME, 'sub_end' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME, - 'last_update' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, + 'last_update' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME, 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, 'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL); } |