Fix to grab and use the actual lat/lon values from the user profile

This commit is contained in:
Sarven Capadisli 2009-12-31 14:23:11 +00:00
parent 5871480844
commit 923e27b01a

View File

@ -110,6 +110,8 @@ class NoticeForm extends Form
$this->user = common_current_user(); $this->user = common_current_user();
} }
$this->profile = $this->user->getProfile();
if (common_config('attachments', 'uploads')) { if (common_config('attachments', 'uploads')) {
$this->enctype = 'multipart/form-data'; $this->enctype = 'multipart/form-data';
} }
@ -198,10 +200,11 @@ class NoticeForm extends Form
$this->out->hidden('notice_return-to', $this->action, 'returnto'); $this->out->hidden('notice_return-to', $this->action, 'returnto');
} }
$this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto'); $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
$this->out->hidden('notice_data-lat', empty($this->lat) ? null : $this->lat, 'lat');
$this->out->hidden('notice_data-lon', empty($this->lon) ? null : $this->lon, 'lon'); $this->out->hidden('notice_data-lat', empty($this->profile->lat) ? null : $this->profile->lat, 'lat');
$this->out->hidden('notice_data-location_id', empty($this->location_id) ? null : $this->location_id, 'location_id'); $this->out->hidden('notice_data-lon', empty($this->profile->lon) ? null : $this->profile->lon, 'lon');
$this->out->hidden('notice_data-location_ns', empty($this->location_ns) ? null : $this->location_ns, 'location_ns'); $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()) { if($this->user->shareLocation()) {
$this->out->elementStart('div',array('id' => 'notice_data-location_enabled_container', 'data-geocode-url' => common_local_url('geocode'))); $this->out->elementStart('div',array('id' => 'notice_data-location_enabled_container', 'data-geocode-url' => common_local_url('geocode')));