Revert "if user allows location sharing but turned off browser location use profile...

This reverts commit 4b80ce0be89fe50eabec1a19dbf4a0c26a413423.

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 748d104ff9391de95bd017d1014dc2eb311a5e23..ed0fa1b2b5768026e486196d0112a2c46af3f54e 100644 (file)
--- 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');