Merge pull request #1338 from roots/remove-old-wp-customizer-frame-op…

…tions-hack Remove old WP customizer frame options hack
roots · Dec 18, 2021 · c8f679e · c8f679e
2 parents ba5767d + a51674d
commit c8f679e
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/roles/wordpress-setup/templates/wordpress-site.conf.j2 b/roles/wordpress-setup/templates/wordpress-site.conf.j2
@@ -206,14 +206,7 @@ server {
   {% block embed_security -%}
   {% if item.value.nginx_embed_security | default(nginx_embed_security | default(true)) -%}
   add_header Content-Security-Policy "frame-ancestors 'self'" always;
-
-  # Conditional X-Frame-Options until https://core.trac.wordpress.org/ticket/40020 is resolved
-  set $x_frame_options SAMEORIGIN;
-  if ($arg_customize_changeset_uuid) {
-    set $x_frame_options "";
-  }
-  add_header X-Frame-Options $x_frame_options always;
-
+  add_header X-Frame-Options SAMEORIGIN always;
   {% endif -%}
   {% endblock -%}