Bugzilla – Attachment 20361 Details for
Bug 10325
Allow system preferences to be overridable from koha-httpd.conf
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10325: QA Followup for lowercase in pref hash and few typos
Bug-10325-QA-Followup-for-lowercase-in-pref-hash-a.patch (text/plain), 3.09 KB, created by
Marcel de Rooy
on 2013-08-15 08:34:42 UTC
(
hide
)
Description:
Bug 10325: QA Followup for lowercase in pref hash and few typos
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2013-08-15 08:34:42 UTC
Size:
3.09 KB
patch
obsolete
>From e11f4acf36f9331124347b9f90f60cbd56da4698 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 15 Aug 2013 09:27:24 +0200 >Subject: [PATCH] Bug 10325: QA Followup for lowercase in pref hash and few > typos >Content-Type: text/plain; charset=utf-8 > >Restoring the lowercase behavior for entries in pref hash in Context.pm. >Textual change in preferences.tt: $pref been -> value for $pref may have been. >Typo in koha-httpd.conf: SevEnv -> SetEnv. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > C4/Context.pm | 6 +++--- > etc/koha-httpd.conf | 4 ++-- > .../prog/en/modules/admin/preferences.tt | 2 +- > 3 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/C4/Context.pm b/C4/Context.pm >index 7bc7097..3f59adb 100644 >--- a/C4/Context.pm >+++ b/C4/Context.pm >@@ -542,8 +542,8 @@ sub preference { > my $self = shift; > my $var = shift; # The system preference to return > >- if ($use_syspref_cache && exists $sysprefs{$var}) { >- return $sysprefs{$var}; >+ if ($use_syspref_cache && exists $sysprefs{lc $var}) { >+ return $sysprefs{lc $var}; > } > > my $dbh = C4::Context->dbh or return 0; >@@ -562,7 +562,7 @@ sub preference { > $value = $dbh->selectrow_array( $sql, {}, $var ); > } > >- $sysprefs{$var} = $value; >+ $sysprefs{lc $var} = $value; > return $value; > } > >diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf >index 6233c9d..c06e6ed 100644 >--- a/etc/koha-httpd.conf >+++ b/etc/koha-httpd.conf >@@ -25,7 +25,7 @@ > # You should add all the system preferences you override > # in one or more vhosts to the environment variable > # OVERRIDE_SYSPREF_NAMES for your staff intranet vhost >-# SevEnv OVERRIDE_SYSPREF_PrefName >+# SetEnv OVERRIDE_SYSPREF_PrefName > > <Directory "__OPAC_WWW_DIR__"> > Options -Indexes >@@ -136,7 +136,7 @@ > # If you are overriding any system preferences, > # list them in this variable so the preference editor > # knows that they have been overridden. >-# SevEnv OVERRIDE_SYSPREF_NAMES "Pref1,Pref2,Pref3" >+# SetEnv OVERRIDE_SYSPREF_NAMES "Pref1,Pref2,Pref3" > > ErrorDocument 400 /cgi-bin/koha/errors/400.pl > ErrorDocument 401 /cgi-bin/koha/errors/401.pl >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index 9e89538..348e367 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -91,7 +91,7 @@ > [% END %] > > [% IF NAME.overridden %] >- <span class="overridden" title="The system preference [% NAME.name %] been overridden from this value by one or more virtual hosts."> >+ <span class="overridden" title="The system preference value for [% NAME.name %] may have been overridden by one or more virtual hosts."> > [Overridden] > </span> > [% END %] >-- >1.7.7.6
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10325
:
18374
|
20228
|
20229
|
20230
|
20360
|
20361
|
20375
|
20376
|
20377