Fix bugs related to default filters.

- Wrong associativity of ternary in filters.phtml
- Missing default restoration in edit history action

module/VuFind/src/VuFind/Controller/SearchController.php

@@ -78,7 +78,11 @@ class SearchController extends AbstractSolrSearch
         $initialParams = $factory->fromParams($params);
 
         if ($removeAllFilters) {
+            $defaultFilters = $params->getOptions()->getDefaultFilters();
             $query = $initialParams->removeAllFilters();
+            foreach ($defaultFilters as $filter) {
+                $query = $query->addFilter($filter);
+            }
         } elseif ($removeFacet) {
             $defaults = ['operator' => 'AND', 'field' => '', 'value' => ''];
             extract($removeFacet + $defaults);

themes/bootstrap3/templates/search/filters.phtml

@@ -112,11 +112,12 @@
 
 <?php if ($hasDefaultsApplied || $filterCount > 0): ?>
   <?php
-    $resetLink = $onlyDefaultsApplied
-      ? null
-      : isset($urlQuery)
+    $resetLink = null;
+    if (!$onlyDefaultsApplied) {
+      $resetLink = isset($urlQuery)
         ? $urlQuery->removeAllFilters()->resetDefaultFilters()
         : $this->searchMemory()->getEditLink($this->searchClassId, 'removeAllFilters', 1);
+    }
   ?>
   <?php // Normal view ?>
   <div class="active-filters hidden-xs">