wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "if user allows location sharing but turned off browser location use profile location"

Browse Source 
This reverts commit 4b80ce0be8.
This commit is contained in:
Evan Prodromou 2010-04-01 12:52:12 -04:00
parent 4b80ce0be8
commit 8b24ad8a9c
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
actions/newnotice.php
View File

@ -184,21 +184,13 @@ class NewnoticeAction extends Action
$options = array('reply_to' => ($replyto == 'false') ? null : $replyto); $options = array('reply_to' => ($replyto == 'false') ? null : $replyto);
if ($user->shareLocation()) { if ($user->shareLocation() && $this->arg('notice_data-geo')) {
// use browser data if checked; otherwise profile data
if ($this->arg('notice_data-geo')) { $locOptions = Notice::locationOptions($this->trimmed('lat'),
$locOptions = Notice::locationOptions($this->trimmed('lat'), $this->trimmed('lon'),
$this->trimmed('lon'), $this->trimmed('location_id'),
$this->trimmed('location_id'), $this->trimmed('location_ns'),
$this->trimmed('location_ns'), $user->getProfile());
$user->getProfile());
} else {
$locOptions = Notice::locationOptions(null,
null,
null,
null,
$user->getProfile());
}
$options = array_merge($options, $locOptions); $options = array_merge($options, $locOptions);
} }
@ -209,6 +201,8 @@ class NewnoticeAction extends Action
$upload->attachToNotice($notice); $upload->attachToNotice($notice);
} }
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
header('Content-Type: text/xml;charset=utf-8'); header('Content-Type: text/xml;charset=utf-8');
$this->xw->startDocument('1.0', 'UTF-8'); $this->xw->startDocument('1.0', 'UTF-8');