merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

1 files changed, 7 insertions, 6 deletions

diff --git a/rt/share/html/Prefs/Quicksearch.html b/rt/share/html/Prefs/Quicksearch.html
index 2642aa550..0d3e58b79 100644
--- a/rt/share/html/Prefs/Quicksearch.html
+++ b/rt/share/html/Prefs/Quicksearch.html
@@ -53,14 +53,15 @@
 <form method="post" action="Quicksearch.html" name="Preferences">
 <ul>
 % for my $queue (@queues) {
-<li><input type="checkbox" class="checkbox" name="Want-<%$queue->Name%>" value="1"
+<li><input type="checkbox" class="checkbox" id="Want-<%$queue->Name%>" name="Want-<%$queue->Name%>" value="1"
 % unless ($unwanted->{$queue->Name}) {
 checked="checked"
 % }
-/><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></li>
+/>
+<label for="Want-<%$queue->Name%>"><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></label>
+</li>
 % }
 </ul>
-
 <& /Elements/Submit,
     Caption             => loc("Save Changes"),
     Label               => loc('Save'),
@@ -94,10 +95,10 @@ my @queues = grep { $right ? $_->CurrentUserHasRight($right) : 1 } @{$Queues->It
 if ($ARGS{'Save'}) {
     for my $queue (@queues) {
         if ($ARGS{"Want-".$queue->Name}) {
-	    delete $unwanted->{$queue->Name};
-	}
+            delete $unwanted->{$queue->Name};
+        }
         else {
-	    ++$unwanted->{$queue->Name};
+            ++$unwanted->{$queue->Name};
         }
     }