Merge branch 'master' of git.evergreen-ils.org:/contrib/Conifer into rel_2_11_mergery...

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/advanced/search.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/record/summary.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/searchbar.tt2
index cc6f86e,a48c4a0..0c6e96e
--- 1/Open-ILS/src/templates/opac/parts/searchbar.tt2
--- 2/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@@ -98,10 -98,15 +98,15 @@@
          [% END %]
      </div>
      [%- END %]
-     [% UNLESS took_care_of_form %]</form>[% END %]
+     [% UNLESS took_care_of_form %]
+         [% IF ctx.default_sort %]
+             <input type="hidden" name="sort" value="[% ctx.default_sort %]"/>
+         [% END %]
+         </form>
+     [% END %]
      [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
      <div class="opac-auto-102">
 -        [ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
 +        [ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]" rel="nofollow">[%
              l('Refine My Original Search')
          %]</a> ]
      </div>