diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
| commit | 16061e060354affb25701a8c6111ee30df2ac19c (patch) | |
| tree | a2d0f949b532f582becff31ef7f79b5deacc4186 /perllib/Catalyst/Plugin/Session/State/Cookie.pm | |
| parent | b38ba427f7facd6e8042ae667b5b3bac1724803a (diff) | |
| parent | 1fc50dcc7f65ae04055a803579445a9397e3ffdf (diff) | |
Merge branch 'master' into barnet-integration
(prior to go-live... amongst other things, the Barnet web templates had changed.
NB conflict with carton.lock, accepted master in full)
Conflicts:
carton.lock
Diffstat (limited to 'perllib/Catalyst/Plugin/Session/State/Cookie.pm')
| -rw-r--r-- | perllib/Catalyst/Plugin/Session/State/Cookie.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perllib/Catalyst/Plugin/Session/State/Cookie.pm b/perllib/Catalyst/Plugin/Session/State/Cookie.pm index 7c9f32878..e0a651ed9 100644 --- a/perllib/Catalyst/Plugin/Session/State/Cookie.pm +++ b/perllib/Catalyst/Plugin/Session/State/Cookie.pm @@ -50,8 +50,9 @@ sub update_session_cookie { sub cookie_is_rejecting { my ( $c, $cookie ) = @_; - # Don't output cookie for JS files. mySociety addition - return 1 if substr $c->request->path, -3 eq '.js'; + # Don't output cookie for JS or JPEG files. mySociety addition + return 1 if substr($c->request->path, -3) eq '.js' + || substr($c->request->path, -5) eq '.jpeg'; if ( $cookie->{path} ) { return 1 if index '/'.$c->request->path, $cookie->{path}; |