Bugzilla – Attachment 77799 Details for
Bug 19817
Merge local and online documentations
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19817: use https instead of http
Bug-19817-use-https-instead-of-http.patch (text/plain), 4.45 KB, created by
Martin Renvoize (ashimema)
on 2018-08-14 15:13:42 UTC
(
hide
)
Description:
Bug 19817: use https instead of http
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-08-14 15:13:42 UTC
Size:
4.45 KB
patch
obsolete
>From f08ab46caa19d03abaf458c4df23748d7b37e4a8 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 <martin.renvoize@ptfs-europe.com> >--- > 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 cab6156f95..b0f76ffc15 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 56ef20ab34..cdc1a95775 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 7aabdd293e..86b9cfb286 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 c3e77f2ad7..0c63b352fa 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.18.0
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 19817
:
69807
|
69808
|
70131
|
70132
|
70133
|
73523
|
73524
|
73525
|
73526
|
73527
|
73651
|
73652
|
73872
|
73877
|
73931
|
73932
|
73933
|
73934
|
73935
|
73936
|
73937
|
73938
|
74567
|
74568
|
74569
|
74570
|
74571
|
74572
|
74573
|
74574
|
74644
|
74645
|
74646
|
74647
|
74648
|
74649
|
74650
|
74651
|
75370
|
75371
|
75372
|
75373
|
75374
|
75375
|
75376
|
75377
|
76151
|
76152
|
76153
|
76154
|
76155
|
76156
|
76157
|
76158
|
77791
|
77792
|
77793
|
77794
|
77795
|
77797
|
77798
|
77799
|
77932
|
77942
|
77943
|
77944
|
77945
|
77946
|
77947
|
77948
|
77949
|
77950
|
77951
|
78953
|
87238