ISTWCMS-4729: cleaning up code for search form

src/Form/UwSearchForm.php

@@ -139,19 +139,14 @@ class UwSearchForm extends FormBase {
     // Get the values from the form state.
     $values = $form_state->getValues();
 
-    // If there is search text or type, get the parameters
-    // set for the redirect to the search.
-    if ($values['search-input'] || $values['search-type']) {
-
-      // If this is a site search, add it to parameters.
-      if ($values['search-type']) {
-        $parameters .= $values['search-type'] . ' ';
-      }
-
-      // If there is search text add it to the parameters.
-      if ($values['search-input']) {
-        $parameters .= $values['search-input'];
-      }
+    // If this is a site search, add it to parameters.
+    if ($values['search-type']) {
+      $parameters .= $values['search-type'] . ' ';
+    }
+
+    // If there is search text add it to the parameters.
+    if ($values['search-input']) {
+      $parameters .= $values['search-input'];
     }
 
     // The URL to the uwaterloo search.