Fixes #4631 - Edit button modal caption and submit button issue.

e107inc · Dec 15, 2021 · d8ce385 · d8ce385
1 parent 0d8f3e9
commit d8ce385
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
@@ -5056,22 +5056,24 @@ private function renderOptions($parms, $id, $attributes)
 				$eModalCap = null;
 			}
 
-			if (!empty($parms['modalSubmit']))
-			{
-				$eModalCap .= " data-modal-submit='true'";
-			}
-
 			$query = http_build_query($query);
-			$text .= "<a" . $this->attributes([
+
+			$att = [
 					'href'               => e_SELF . "?$query",
 					'class'              => "btn btn-default btn-secondary$eModal",
 					'data-modal-caption' => $eModalCap,
 					'title'              => LAN_EDIT,
 					'data-toggle'        => 'tooltip',
 					'data-bs-toggle'     => 'tooltip',
 					'data-placement'     => 'left',
-				]) . ">
-				" . $editIconDefault . '</a>';
+				];
+
+			if (!empty($parms['modalSubmit']))
+			{
+				$att['data-modal-submit'] = 'true';
+			}
+
+			$text .= '<a' . $this->attributes($att) . '>' . $editIconDefault . '</a>';
 		}
 
 		$delcls = !empty($attributes['noConfirm']) ? ' no-confirm' : '';