From 98ce7daf5650ebd7e6f6bbaca6e57069ffccae55 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 29 Dec 2009 16:17:17 -0500
Subject: Implement user interface for user to preview what location they are
 sharing with a notice

---
 actions/newnotice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions/newnotice.php')

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 2d9f0ff79..8d89e9da0 100644
--- 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'),
-- 
cgit v1.2.3-54-g00ecf