From bb98e99dc6349ba316889e2123f6218d42863fc7 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 6 Feb 2018 10:41:03 -0300
Subject: [PATCH] Bug 12904: Fix occurrences not caught by script

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
---
 .../intranet-tmpl/prog/en/includes/intranetstylesheet.inc   | 2 +-
 .../opac-tmpl/bootstrap/en/includes/doc-head-close.inc      | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc
index 54ead224fb..ce3c1c4cfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranetstylesheet.inc
@@ -1,4 +1,4 @@
-[% SET intranetstylesheet='staff-global.css' UNLESS intranetstylesheet %]
+[% SET intranetstylesheet='staff-global_' _ KOHA_VERSION _ '.css' UNLESS intranetstylesheet %]
 [% IF (intranetstylesheet.match('^https?:|^\/')) %]
     <link rel="stylesheet" type="text/css" href="[% intranetstylesheet %]" />
 [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
index 0f651c8c4a..838606e0a9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -14,7 +14,7 @@
     <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/lib/jquery/jquery-ui_[% KOHA_VERSION %].css" />
 [% END %]
 
-[% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
+[% SET opaclayoutstylesheet='opac_' _ KOHA_VERSION _ '.css' UNLESS opaclayoutstylesheet %]
 [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
     <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" />
 [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 70c8ad9b62..fcc3ee8826 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -90,11 +90,11 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
         // Test need for polyfill
         {
             test: window.matchMedia,
-            nope: "[% interface %]/[% theme %]/lib/media.match.min.js"
+            nope: "[% interface %]/[% theme %]/lib/media.match.min_[% KOHA_VERSION %].js"
         },
         // and then load enquire
-        "[% interface %]/[% theme %]/lib/enquire.min.js",
-        "[% interface %]/[% theme %]/js/script.js"
+        "[% interface %]/[% theme %]/lib/enquire.min_[% KOHA_VERSION %].js",
+        "[% interface %]/[% theme %]/js/script_[% KOHA_VERSION %].js"
     ]);
 
     // Fix for datepicker in a modal
-- 
2.39.5