diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-02 15:48:17 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-02 15:48:17 -0700 |
| commit | b42e044f6e5111fe6cb7d4a7b7431cd9b9b67ccb (patch) | |
| tree | 30b4c1733dfe71cbeec56021c48b20b4204070d7 | |
| parent | 61394aa8ac3585c9b7f1e15b6c581af01854987d (diff) | |
| parent | ec24f283dd6f1371125c042529f571645a5f13fa (diff) | |
Merge branch 'master' into testing
| -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'); |