Bugzilla – Attachment 53288 Details for
Bug 16813
OPACBaseURL cannot be emptied
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 16813: Allow empty string for OPACBaseURL
PASSED-QA-Bug-16813-Allow-empty-string-for-OPACBas.patch (text/plain), 1.89 KB, created by
Katrin Fischer
on 2016-07-11 21:39:20 UTC
(
hide
)
Description:
[PASSED QA] Bug 16813: Allow empty string for OPACBaseURL
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2016-07-11 21:39:20 UTC
Size:
1.89 KB
patch
obsolete
>From 0e0a99760295683ce22eff47b6fe9db346e1d8eb Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 27 Jun 2016 13:32:31 +0100 >Subject: [PATCH] [PASSED QA] Bug 16813: Allow empty string for OPACBaseURL > >The pref is prefixed by 'http://', but it should not when the pref is >set to an empty string. >This will fix the bug raised on bug 14790 comment 14. > >Test plan: >Empty OPACBaseURL and confirm that it's save as it in DB > >Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com> >OPACBaseURL is saved up empty. Prefix http:// is not saved anymore > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > C4/Context.pm | 2 +- > t/db_dependent/Context.t | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > >diff --git a/C4/Context.pm b/C4/Context.pm >index 1bf23c2..4ff47af 100644 >--- a/C4/Context.pm >+++ b/C4/Context.pm >@@ -615,7 +615,7 @@ sub set_preference { > $value = 0 if ( $type && $type eq 'YesNo' && $value eq '' ); > > # force explicit protocol on OPACBaseURL >- if ( $variable eq 'opacbaseurl' && substr( $value, 0, 4 ) !~ /http/ ) { >+ if ( $variable eq 'opacbaseurl' && $value && substr( $value, 0, 4 ) !~ /http/ ) { > $value = 'http://' . $value; > } > >diff --git a/t/db_dependent/Context.t b/t/db_dependent/Context.t >index b5a050f..bce0cef 100755 >--- a/t/db_dependent/Context.t >+++ b/t/db_dependent/Context.t >@@ -39,6 +39,10 @@ C4::Context->clear_syspref_cache(); > $OPACBaseURL = C4::Context->preference('OPACBaseURL'); > is($OPACBaseURL,'http://junk2','OPACBaseURL saved with http:// as specified'); > >+C4::Context->set_preference('OPACBaseURL', ''); >+$OPACBaseURL = C4::Context->preference('OPACBaseURL'); >+is($OPACBaseURL,'','OPACBaseURL saved empty as specified'); >+ > C4::Context->set_preference('SillyPreference','random'); > C4::Context->clear_syspref_cache(); > my $SillyPeference = C4::Context->preference('SillyPreference'); >-- >1.9.1
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 16813
:
52889
|
53032
| 53288