diff options
| author | Brion Vibber <brion@pobox.com> | 2010-07-12 14:21:57 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-07-12 14:21:57 -0700 |
| commit | cd29d3d646379aa9a1352035973c8e379cc7f42b (patch) | |
| tree | e064c5292c546e6df8eaad9609a56150f69c62c3 /actions/newnotice.php | |
| parent | bd8506eee883ecd424fdf3d7e545c10c754df6ff (diff) | |
| parent | 1b3b7f9a422f6b703ec36d43e2283f91a9835f3b (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/newnotice.php')
| -rw-r--r-- | actions/newnotice.php | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php index ed0fa1b2b..748d104ff 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -184,13 +184,21 @@ class NewnoticeAction extends Action $options = array('reply_to' => ($replyto == 'false') ? null : $replyto); - if ($user->shareLocation() && $this->arg('notice_data-geo')) { - - $locOptions = Notice::locationOptions($this->trimmed('lat'), - $this->trimmed('lon'), - $this->trimmed('location_id'), - $this->trimmed('location_ns'), - $user->getProfile()); + if ($user->shareLocation()) { + // use browser data if checked; otherwise profile data + if ($this->arg('notice_data-geo')) { + $locOptions = Notice::locationOptions($this->trimmed('lat'), + $this->trimmed('lon'), + $this->trimmed('location_id'), + $this->trimmed('location_ns'), + $user->getProfile()); + } else { + $locOptions = Notice::locationOptions(null, + null, + null, + null, + $user->getProfile()); + } $options = array_merge($options, $locOptions); } @@ -201,8 +209,6 @@ class NewnoticeAction extends Action $upload->attachToNotice($notice); } - - if ($this->boolean('ajax')) { header('Content-Type: text/xml;charset=utf-8'); $this->xw->startDocument('1.0', 'UTF-8'); |