summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-12-31 14:24:27 +0000
committerSarven Capadisli <csarven@status.net>2009-12-31 14:24:27 +0000
commit4efa841ba330cedd4ad71349a8196f18d5546cb8 (patch)
tree29f0dc844405d3bc330871b28d3f48c785c899df
parent923e27b01a81c70ab52bc1b5856368143d0d32cf (diff)
If user doesn't want to share their location (which is globally set
from their profile settings), don't bother to output form data for lat/long in the notice form.
-rw-r--r--lib/noticeform.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/noticeform.php b/lib/noticeform.php
index c60ac29c3..50b2e6893 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -201,12 +201,12 @@ class NoticeForm extends Form
}
$this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
- $this->out->hidden('notice_data-lat', empty($this->profile->lat) ? null : $this->profile->lat, 'lat');
- $this->out->hidden('notice_data-lon', empty($this->profile->lon) ? null : $this->profile->lon, 'lon');
- $this->out->hidden('notice_data-location_id', empty($this->profile->location_id) ? null : $this->profile->location_id, 'location_id');
- $this->out->hidden('notice_data-location_ns', empty($this->profile->location_ns) ? null : $this->profile->location_ns, 'location_ns');
+ if ($this->user->shareLocation()) {
+ $this->out->hidden('notice_data-lat', empty($this->profile->lat) ? null : $this->profile->lat, 'lat');
+ $this->out->hidden('notice_data-lon', empty($this->profile->lon) ? null : $this->profile->lon, 'lon');
+ $this->out->hidden('notice_data-location_id', empty($this->profile->location_id) ? null : $this->profile->location_id, 'location_id');
+ $this->out->hidden('notice_data-location_ns', empty($this->profile->location_ns) ? null : $this->profile->location_ns, 'location_ns');
- if($this->user->shareLocation()) {
$this->out->elementStart('div',array('id' => 'notice_data-location_enabled_container', 'data-geocode-url' => common_local_url('geocode')));
$this->out->checkbox('notice_data-location_enabled',_('Share your location'));
$this->out->element('a', array('style' => 'display: none', 'target' => '_blank', 'id' => 'notice_data-location_name'), _('Finding your location...'));