diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2020-01-31 13:07:08 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2020-01-31 13:07:08 +0000 |
| commit | 95f99fb5755e5d013e6cd34f81c01eb656da5890 (patch) | |
| tree | e51466d682695de18a836254bc34fce5ac435e1e /perllib | |
| parent | 6525931fb9194e90a4430660086a5e981567fb7f (diff) | |
| parent | 113f06353a62128b878bfb8dcfa99d15cd9b7ecb (diff) | |
Merge branch 'admin-user-logged-preference'
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index c1afccdfd..047d15fe3 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -369,8 +369,8 @@ sub set_allowed_pages : Private { sub get_user : Private { my ( $self, $c ) = @_; - my $user = $c->req->remote_user(); - $user ||= ($c->user && $c->user->name); + my $user = ($c->user && $c->user->name); + $user ||= $c->req->remote_user(); $user ||= ''; return $user; |