From d60c1f1a9f343f10d33800862c67839594607c8f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 1 Apr 2010 12:58:06 -0400
Subject: [PATCH] Revert "Revert "if user allows location sharing but turned
 off browser location use profile location""

This reverts commit 8b24ad8a9c681585e95612084eb629df8b364b74.
---
 actions/newnotice.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index ed0fa1b2b5..748d104ff9 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');