diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-01-01 21:12:22 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-01-01 21:12:22 +0000 |
| commit | e6ea91a84bd8afd1dee668f02f0b5f0fba66e21d (patch) | |
| tree | 4a32b7f676ff15dfe17748d9016781806d12e60e /classes | |
| parent | f6ab4ea1362492a491f9474c5d0e803857bf9583 (diff) | |
| parent | c11b339dc385ef3fa2aef7d53cdfae4a03cdfa96 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 2 | ||||
| -rw-r--r-- | classes/User_location_prefs.php | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 9f68c5255..fe3f3c017 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1129,7 +1129,7 @@ class Notice extends Memcached_DataObject $xs->element('id', null, $this->uri); $xs->element('published', null, common_date_w3dtf($this->created)); - $xs->element('updated', null, common_date_w3dtf($this->modified)); + $xs->element('updated', null, common_date_w3dtf($this->created)); if ($this->reply_to) { $reply_notice = Notice::staticGet('id', $this->reply_to); diff --git a/classes/User_location_prefs.php b/classes/User_location_prefs.php index 52cb254ba..bd6029f97 100644 --- a/classes/User_location_prefs.php +++ b/classes/User_location_prefs.php @@ -45,4 +45,9 @@ class User_location_prefs extends Memcached_DataObject /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE + + function sequenceKey() + { + return array(false, false, false); + } } |