diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-06-30 16:56:12 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-06-30 16:56:12 +0100 |
| commit | 0e6bb3e802c0614d64366bd19732b37a574dc12c (patch) | |
| tree | 01b5d111754a0acef3f8a71da526ce1fbe59de55 /perllib/FixMyStreet/App.pm | |
| parent | b756440e4b5c0b356ee0d65d1647124317535c95 (diff) | |
| parent | fb78afe61194ea9b6fbec9596d69627e315ab97f (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/App/Controller/Reports.pm
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 47b290eff..90f1f24bc 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -51,8 +51,7 @@ __PACKAGE__->config( 'Plugin::Session' => { # Catalyst::Plugin::Session::Store::DBIC dbic_class => 'DB::Session', - expires => 3600 * 24 * 7 * 6, # 6 months - cookie_expires => 0 + expires => 3600 * 24 * 7 * 4, # 4 weeks }, 'Plugin::Authentication' => { @@ -181,7 +180,8 @@ sub setup_request { Memcached::set_namespace( FixMyStreet->config('BCI_DB_NAME') . ":" ); - FixMyStreet::Map::set_map_class( $c->request->param('map') ); + my $map = $host =~ /^osm\./ ? 'OSM' : $c->req->param('map'); + FixMyStreet::Map::set_map_class( $map ); return $c; } |