From a79a6c154ea2335051acd74308292d0391175804 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 10 Apr 2018 11:07:03 -0300 Subject: [PATCH] Bug 19817: use https instead of http the https version was not working when I wrote the first patches Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer --- Koha/Manual.pm | 2 +- installer/data/mysql/atomicupdate/bug_19817.sql | 2 +- installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/enhanced_content.pref | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Koha/Manual.pm b/Koha/Manual.pm index cab6156..b0f76ff 100644 --- a/Koha/Manual.pm +++ b/Koha/Manual.pm @@ -28,7 +28,7 @@ sub _get_base_url { } @available_languages; my $KohaManualLanguage = $language || C4::Context->preference('KohaManualLanguage') || 'en'; - my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'http://koha-community.org/manual'; + my $KohaManualBaseURL = C4::Context->preference('KohaManualBaseURL') || 'https://koha-community.org/manual'; if ( $KohaManualBaseURL =~ m|^/| ) { $KohaManualBaseURL = C4::Context->preference('staffClientBaseURL') . $KohaManualBaseURL; } diff --git a/installer/data/mysql/atomicupdate/bug_19817.sql b/installer/data/mysql/atomicupdate/bug_19817.sql index 56ef20a..cdc1a95 100644 --- a/installer/data/mysql/atomicupdate/bug_19817.sql +++ b/installer/data/mysql/atomicupdate/bug_19817.sql @@ -1,5 +1,5 @@ INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) -VALUES ('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'); +VALUES ('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'); INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 7aabdd2..86b9cfb 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -240,7 +240,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('itemBarcodeInputFilter','','whitespace|T-prefix|cuecat|libsuite8|EAN13','If set, allows specification of a item barcode input filter','Choice'), ('itemcallnumber','082ab',NULL,'The MARC field/subfield that is used to calculate the itemcallnumber (Dewey would be 082ab or 092ab; LOC would be 050ab or 090ab) could be 852hi from an item record','free'), ('KohaAdminEmailAddress','root@localhost','','Define the email address where patron modification requests are sent','free'), -('KohaManualBaseURL','http://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'), +('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'), ('KohaManualLanguage','en','en|ar|cs|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'), ('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'), ('language','en',NULL,'Set the default language in the staff client.','Languages'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref index c3e77f2..0c63b35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref @@ -401,7 +401,7 @@ Enhanced Content: - - Location of the Koha manual - pref: KohaManualBaseURL - - You can specify the location of the Koha manual to use. By default it is http://koha-community.org/manual/ + - You can specify the location of the Koha manual to use. By default it is https://koha-community.org/manual/ - If starts with '/', the value of staffClientBaseURL will be used as a prefix. - Note that it will be suffixed by the version / the language / the format (/17.11/en/html) - -- 2.1.4