From f8abcf3e8e44d04fde81083575662f401dce438c Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@koha-community.org>
Date: Mon, 22 Jun 2015 15:45:13 +0200
Subject: [PATCH] Bug 12137: Use Koha.Preference to access pref value

Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
---
 C4/Auth.pm                                             | 2 --
 koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc  | 3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 03b80685e1..ef0c585da4 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -398,7 +398,6 @@ sub get_template_and_user {
             AmazonCoverImages                                                          => C4::Context->preference("AmazonCoverImages"),
             AutoLocation                                                               => C4::Context->preference("AutoLocation"),
             "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1,
-            CalendarFirstDayOfWeek                                                     => C4::Context->preference("CalendarFirstDayOfWeek"),
             CircAutocompl                                                              => C4::Context->preference("CircAutocompl"),
             FRBRizeEditions                                                            => C4::Context->preference("FRBRizeEditions"),
             IndependentBranches                                                        => C4::Context->preference("IndependentBranches"),
@@ -472,7 +471,6 @@ sub get_template_and_user {
             AuthorisedValueImages                 => C4::Context->preference("AuthorisedValueImages"),
             BranchesLoop                          => GetBranchesLoop($opac_name),
             BranchCategoriesLoop                  => GetBranchCategories( 'searchdomain', 1, $opac_name ),
-            CalendarFirstDayOfWeek                => C4::Context->preference("CalendarFirstDayOfWeek"),
             LibraryName                           => "" . C4::Context->preference("LibraryName"),
             LibraryNameTitle                      => "" . $LibraryNameTitle,
             LoginBranchname                       => C4::Context->userenv ? C4::Context->userenv->{"branchname"} : "",
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index 8eb3fcb496..9fd0ea5f57 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -1,3 +1,4 @@
+[% USE Koha %]
 <script type="text/javascript">
 //<![CDATA[
 
@@ -66,7 +67,7 @@ jQuery(function($){
         dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
         weekHeader: _("Wk"),
         dateFormat: "[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]",
-        firstDay: [% CalendarFirstDayOfWeek %],
+        firstDay: [% Koha.Preference('CalendarFirstDayOfWeek') %],
         isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
         showMonthAfterYear: false,
         yearSuffix: ''};
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
index 4280540669..a005216f4f 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
@@ -1,3 +1,4 @@
+[% USE Koha %]
 <script type="text/javascript">
     //<![CDATA[
         var debug    = "[% debug %]";
@@ -37,7 +38,7 @@
                 dayNamesMin: [_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")],
                 weekHeader: _("Wk"),
                 dateFormat: '[% IF ( dateformat == "us" ) %]mm/dd/yy[% ELSIF ( dateformat == "metric" ) %]dd/mm/yy[% ELSE %]yy-mm-dd[% END %]',
-                firstDay: [% CalendarFirstDayOfWeek %],
+                firstDay: [% Koha.Preference('CalendarFirstDayOfWeek') %],
                 isRTL: [% IF ( bidi ) %]true[% ELSE %]false[% END %],
                 showMonthAfterYear: false,
                 yearSuffix: ''};
-- 
2.39.5