summaryrefslogtreecommitdiff
path: root/actions/newnotice.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-28 14:21:07 -0800
committerEvan Prodromou <evan@status.net>2009-12-28 14:21:07 -0800
commitbb93d6b1c7c697891baca7082261ee694727f161 (patch)
tree03cdb939a0a04d9ef6ef315c306d3dd212f1bb73 /actions/newnotice.php
parentbbf516b96594770c5dc0dea7f9b15937d7c9a237 (diff)
remove namespace setting from location; it's unused
Diffstat (limited to 'actions/newnotice.php')
-rw-r--r--actions/newnotice.php43
1 files changed, 24 insertions, 19 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php
index c014f1781..8591522dc 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -164,19 +164,6 @@ class NewnoticeAction extends Action
$replyto = 'false';
}
- $lat = $this->trimmed('lat');
- $lon = $this->trimmed('lon');
- $location_id = $this->trimmed('location_id');
- $location_ns = $this->trimmed('location_ns');
-
- if (!empty($lat) && !empty($lon) && empty($location_id)) {
- $location = Location::fromLatLon($lat, $lon);
- if (!empty($location)) {
- $location_id = $location->location_id;
- $location_ns = $location->location_ns;
- }
- }
-
$upload = null;
$upload = MediaFile::fromUpload('attach');
@@ -195,12 +182,30 @@ class NewnoticeAction extends Action
}
}
- $notice = Notice::saveNew($user->id, $content_shortened, 'web',
- array('reply_to' => ($replyto == 'false') ? null : $replyto,
- 'lat' => $lat,
- 'lon' => $lon,
- 'location_id' => $location_id,
- 'location_ns' => $location_ns));
+ $options = array('reply_to' => ($replyto == 'false') ? null : $replyto);
+
+ if ($user->shareLocation()) {
+
+ $lat = $this->trimmed('lat');
+ $lon = $this->trimmed('lon');
+ $location_id = $this->trimmed('location_id');
+ $location_ns = $this->trimmed('location_ns');
+
+ if (!empty($lat) && !empty($lon) && empty($location_id)) {
+ $location = Location::fromLatLon($lat, $lon);
+ if (!empty($location)) {
+ $location_id = $location->location_id;
+ $location_ns = $location->location_ns;
+ }
+ }
+
+ $options['lat'] = $lat;
+ $options['lon'] = $lon;
+ $options['location_id'] = $location_id;
+ $options['location_ns'] = $location_ns;
+ }
+
+ $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
if (isset($upload)) {
$upload->attachToNotice($notice);