From bdb5dce566566e8724679564fe612130c064580f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esther=20=C3=81lvarez=20Feijoo?=
 <5547479+EstherAF@users.noreply.github.com>
Date: Sun, 13 Dec 2020 13:58:53 +0100
Subject: [PATCH] JENKINS-64403 Declare the page variable "divBasedFormLayout"
 globally, not only inside forms (#5075)

---
 core/src/main/java/hudson/Functions.java    | 2 +-
 core/src/main/resources/lib/form/form.jelly | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 926d4cee4d..edfe9165c7 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -302,7 +302,7 @@ public class Functions {
          */
         context.setVariable("resURL",rootURL+getResourcePath());
         context.setVariable("imagesURL",rootURL+getResourcePath()+"/images");
-
+        context.setVariable("divBasedFormLayout", true);
         context.setVariable("userAgent", currentRequest.getHeader("User-Agent"));
         IconSet.initPageVariables(context);
     }
diff --git a/core/src/main/resources/lib/form/form.jelly b/core/src/main/resources/lib/form/form.jelly
index 78095acbf5..f2c5a61595 100644
--- a/core/src/main/resources/lib/form/form.jelly
+++ b/core/src/main/resources/lib/form/form.jelly
@@ -53,7 +53,6 @@ THE SOFTWARE.
       Default: false
     </st:attribute>
   </st:documentation>
-  <j:set var="divBasedFormLayout" value="true" />
   <form action="${action}" method="${method}" enctype="${attrs.enctype}" name="${name}" target="${attrs.target}" autocomplete="${attrs.autocomplete==true?'on':'off'}">
     <div width="100%" class="${attrs.tableClass}">
       <d:invokeBody/>