summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/login.php2
-rw-r--r--actions/newnotice.php9
2 files changed, 9 insertions, 2 deletions
diff --git a/actions/login.php b/actions/login.php
index 63955e3f5..cee29fd09 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -164,7 +164,7 @@ class LoginAction extends Action
} else {
$url = common_local_url('all',
array('nickname' =>
- $nickname));
+ $user->nickname));
}
common_redirect($url, 303);
diff --git a/actions/newnotice.php b/actions/newnotice.php
index fbd7ab6bc..dd6da0b01 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -164,6 +164,11 @@ 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');
+
$upload = null;
$upload = MediaFile::fromUpload('attach');
@@ -183,7 +188,9 @@ class NewnoticeAction extends Action
}
$notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
- ($replyto == 'false') ? null : $replyto);
+ ($replyto == 'false') ? null : $replyto,
+ null, null,
+ $lat, $lon, $location_id, $location_ns);
if (isset($upload)) {
$upload->attachToNotice($notice);