fixup! Use ManifestTheme theme_colour for front page theme-color meta…

… tag
mysociety · Feb 14, 2020 · 67469ac · 67469ac
1 parent 09bf213
commit 67469ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/perllib/FixMyStreet/App/Controller/Admin/ManifestTheme.pm b/perllib/FixMyStreet/App/Controller/Admin/ManifestTheme.pm
@@ -14,6 +14,9 @@ sub auto :Private {
  } else {
  $c->stash(rs => $c->model('DB::ManifestTheme')->search_rs({ cobrand => $c->cobrand->moniker }));
  }
+ # We need to unset the default manifest_theme from Root::auto, otherwise
+ # the default icons will appear on our editing form.
+ delete $c->stash->{manifest_theme};
 }
 
 sub index :Path :Args(0) {

diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm
@@ -42,6 +42,8 @@ sub auto : Private {
  $c->forward('check_password_expiry');
  $c->detach('/auth/redirect') if $c->cobrand->call_hook('check_login_disallowed');
 
+ $c->forward('/offline/_stash_manifest_theme', [ $c->cobrand->moniker ]);
+
  return 1;
 }
 
@@ -77,8 +79,6 @@ sub index : Path : Args(0) {
  $c->detach;
  }
 
- $c->forward('/offline/_stash_manifest_theme', [ $c->cobrand->moniker ]);
-
  $c->forward('/auth/get_csrf_token');
 }