diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-28 10:12:56 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-28 10:12:56 +0100 |
| commit | b76cfb3889140f1c771c1f98254f724aad3d4297 (patch) | |
| tree | bb7beada7a603119ea2897f54a6af96814d850e1 /perllib/FixMyStreet/App | |
| parent | 3f21a9742d89c3e4fda47a0be6ec2a17f802c99a (diff) | |
| parent | a8ceae6c99b00aefcba301b2f41033d84701f56a (diff) | |
Merge branch 'offline-tests'
Diffstat (limited to 'perllib/FixMyStreet/App')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Auth.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index 70821f79d..4efa7abb8 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -104,7 +104,7 @@ sub sign_in : Private { Email the user the details they need to sign in. Don't check for an account - if there isn't one we can create it when they come back with a token (which -contains the email addresss). +contains the email address). =cut diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 12280db47..fe7576893 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -275,7 +275,7 @@ sub delete :Local :Args(1) { $p->user->update_reputation(-1); $c->model('DB::AdminLog')->create( { - user => $c->user, + user => $c->user->obj, admin_user => $c->user->from_body->name, object_type => 'problem', action => 'state_change', |