X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fnewnotice.php;h=78480ababb069849508550141ee4c5df9862b78c;hb=ecccb344e0bb5427ed8a3a82fdf2512da67184b6;hp=8591522dc55e9c8f9476a42aab52a0cc3e672989;hpb=bb93d6b1c7c697891baca7082261ee694727f161;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 8591522dc5..78480ababb 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -184,25 +184,15 @@ class NewnoticeAction extends Action
 
         $options = array('reply_to' => ($replyto == 'false') ? null : $replyto);
 
-        if ($user->shareLocation()) {
-
-            $lat = $this->trimmed('lat');
-            $lon = $this->trimmed('lon');
-            $location_id = $this->trimmed('location_id');
-            $location_ns = $this->trimmed('location_ns');
-
-            if (!empty($lat) && !empty($lon) && empty($location_id)) {
-                $location = Location::fromLatLon($lat, $lon);
-                if (!empty($location)) {
-                    $location_id = $location->location_id;
-                    $location_ns = $location->location_ns;
-                }
-            }
+        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['lat'] = $lat;
-            $options['lon'] = $lon;
-            $options['location_id'] = $location_id;
-            $options['location_ns'] = $location_ns;
+            $options = array_merge($options, $locOptions);
         }
 
         $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
@@ -211,7 +201,7 @@ class NewnoticeAction extends Action
             $upload->attachToNotice($notice);
         }
 
-        common_broadcast_notice($notice);
+
 
         if ($this->boolean('ajax')) {
             header('Content-Type: text/xml;charset=utf-8');