diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-10 16:27:23 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-10 16:27:23 -0500 |
| commit | 1f5f5474f175a8248b362f8be4ff23bb5e971305 (patch) | |
| tree | c38d9b80db71ba403c61079502bc12bfe2732654 /classes/Notice.php | |
| parent | 348b155376eac2130150cd041bca9fd4799334cf (diff) | |
| parent | 651cbf0681b6d263dde673ce36811710bfe553b8 (diff) | |
Merge branch '0.9.x' into adminpanel
Diffstat (limited to 'classes/Notice.php')
| -rw-r--r-- | classes/Notice.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 32a8b693c..291e6202b 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -146,7 +146,7 @@ class Notice extends Memcached_DataObject /* Add them to the database */ foreach(array_unique($hashtags) as $hashtag) { - /* elide characters we do not want in the tag */ + /* elide characters we don't want in the tag */ $this->saveTag($hashtag); } return true; @@ -1105,7 +1105,7 @@ class Notice extends Memcached_DataObject if (empty($recipient)) { continue; } - // Do not save replies from blocked profile to local user + // Don't save replies from blocked profile to local user $recipient_user = User::staticGet('id', $recipient->id); if (!empty($recipient_user) && $recipient_user->hasBlocked($sender)) { continue; @@ -1131,7 +1131,7 @@ class Notice extends Memcached_DataObject $tagged = Profile_tag::getTagged($sender->id, $tag); foreach ($tagged as $t) { if (!$replied[$t->id]) { - // Do not save replies from blocked profile to local user + // Don't save replies from blocked profile to local user $t_user = User::staticGet('id', $t->id); if ($t_user && $t_user->hasBlocked($sender)) { continue; @@ -1254,6 +1254,12 @@ class Notice extends Memcached_DataObject } } + if (!empty($this->lat) && !empty($this->lon)) { + $xs->elementStart('geo', array('xmlns:georss' => 'http://www.georss.org/georss')); + $xs->element('georss:point', null, $this->lat . ' ' . $this->lon); + $xs->elementEnd('geo'); + } + $xs->elementEnd('entry'); return $xs->getString(); |