remove redundant chilifresh script import; repaired bug in chilifresh SSI expression

diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
index 2ab945b..9c9ff32 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/js_common_postbody.xml
@@ -16,7 +16,7 @@
     var novelist = '<!--#echo var="OILS_NOVELIST_URL"-->';
     if (novelist == '(none)') { novelist = false; }
 
-    <!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != (none)"-->
+    <!--#if expr="$OILS_CHILIFRESH_ACCOUNT && $OILS_CHILIFRESH_ACCOUNT != '(none)'"-->
     openils.Util.requireLegacy('<!--#echo var='OILS_CHILIFRESH_URL'-->');
     <!--#endif-->
 

diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
index 38391be..d4f3726 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
+++ b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
@@ -221,7 +221,6 @@
             value="<!--#echo var='OILS_CHILIFRESH_PROFILE'-->" />
         <input type="hidden" id="chilifresh_version" name="chilifresh_version" value="onsite_v1" />
         <input type="hidden" id="chilifresh_type" name="chilifresh_type" value="search" />
-        <script language="javascript" type="text/javascript" src="<!--#echo var='OILS_CHILIFRESH_URL'-->"></script>
     <!--endif-->
 </div>