summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-04-01 12:52:12 -0400
committerEvan Prodromou <evan@status.net>2010-04-01 12:52:12 -0400
commit8b24ad8a9c681585e95612084eb629df8b364b74 (patch)
treedd98d082267abf41c3abbd4703221a4bf25fa484
parent4b80ce0be89fe50eabec1a19dbf4a0c26a413423 (diff)
Revert "if user allows location sharing but turned off browser location use profile location"
This reverts commit 4b80ce0be89fe50eabec1a19dbf4a0c26a413423.
-rw-r--r--actions/newnotice.php24
1 files changed, 9 insertions, 15 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 748d104ff..ed0fa1b2b 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -184,21 +184,13 @@ class NewnoticeAction extends Action
$options = array('reply_to' => ($replyto == 'false') ? null : $replyto);
- 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());
- }
+ 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());
$options = array_merge($options, $locOptions);
}
@@ -209,6 +201,8 @@ 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');