Implement user interface for user to preview what location they are sharing with...

[quix0rs-gnu-social.git] / actions / newnotice.php

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 2d9f0ff797d973fc31e5970a28061859fc7054d7..8d89e9da07edc394fa21e9ce777055960bee59f1 100644 (file)
--- 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'),