Merge branch 'release-3.1'

themes/bootstrap3/templates/collections/home.phtml

@@ -6,7 +6,7 @@
   foreach (isset($filters['Other']) ? $filters['Other'] : [] as $filter) {
     $filter['urlPart'] = $filter['field'] . ':' . $filter['value'];
     $filterList[] = $filter;
-    $filterString .= '&' . urlencode('filter[]') .  '=' . urlencode($filter['urlPart']);
+    $filterString .= '&' . urlencode('filter[]') .  '=' . urlencode($filter['urlPart']);
   }
 ?>
 
@@ -42,7 +42,7 @@
         $removalUrl = $this->url('collections-home') . '?from=' . urlencode($from);
         foreach ($filterList as $current) {
           if ($current['urlPart'] != $filter['urlPart']) {
-            $removalUrl .= '&' . urlencode('filter[]') .  '=' . urlencode($current['urlPart']);
+            $removalUrl .= '&' . urlencode('filter[]') .  '=' . urlencode($current['urlPart']);
           }
         }
       ?>

themes/bootstrap3/templates/search/reservessearch.phtml

@@ -53,8 +53,8 @@
         <?
             $url = $this->currentPath() . $this->escapeHtmlAttr(
                 '?inst=' . urlencode($record->getInstructorId())
-                . '&amp;course=' . urlencode($record->getCourseId())
-                . '&amp;dept=' . urlencode($record->getDepartmentId())
+                . '&course=' . urlencode($record->getCourseId())
+                . '&dept=' . urlencode($record->getDepartmentId())
             );
         ?>
         <tr>