diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-31 09:14:55 -1000 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-31 09:14:55 -1000 |
| commit | 053b8c600d7db73ec19e5f1d3e26c4c98fdf3d8c (patch) | |
| tree | 5664c78f951e91827c810b745a771aeb21ab9dbf /actions/newnotice.php | |
| parent | ad8ea98cd72855f61c71945b533331b6f30d04b6 (diff) | |
| parent | 01dbee2ba5280d97ddd0bb82217e8b3e7680e67b (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/newnotice.php')
| -rw-r--r-- | actions/newnotice.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php index 2d9f0ff79..8d89e9da0 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -184,7 +184,7 @@ class NewnoticeAction extends Action $options = array('reply_to' => ($replyto == 'false') ? null : $replyto); - if ($user->shareLocation()) { + if ($user->shareLocation() && $this->arg('notice_data-location_enabled')) { $locOptions = Notice::locationOptions($this->trimmed('lat'), $this->trimmed('lon'), |