diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
| commit | f465e32109d6600887f1c5765b44347a4cfaa3d7 (patch) | |
| tree | 3855e96d1d69683b388d82c27bad3f9e339f2792 /perllib/FixMyStreet/App/Controller/Report/Update.pm | |
| parent | 1b15ca0aea334d20fb0f19fed36bc948668e2a14 (diff) | |
| parent | c9681f6bbc04659b9d6ed5eaa46b8c2edd704f9e (diff) | |
Merge branch 'redesign'
Conflicts:
.gitignore
notes/INSTALL
perllib/FixMyStreet/App/Controller/Photo.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'perllib/FixMyStreet/App/Controller/Report/Update.pm')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/Update.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index 29933e2f6..15444f556 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -122,7 +122,7 @@ sub process_user : Private { # The user is trying to sign in. We only care about email from the params. if ( $c->req->param('submit_sign_in') || $c->req->param('password_sign_in') ) { unless ( $c->forward( '/auth/sign_in', [ $email ] ) ) { - $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one.'); + $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.'); return 1; } my $user = $c->user->obj; @@ -282,10 +282,7 @@ sub save_update : Private { # If there was a photo add that too if ( my $fileid = $c->stash->{upload_fileid} ) { - my $file = file( $c->config->{UPLOAD_CACHE}, "$fileid.jpg" ); - my $blob = $file->slurp; - $file->remove; - $update->photo($blob); + $update->photo($fileid); } if ( $update->in_storage ) { |