From c6489c1ccd48de558a5b241d6b1b45dd08c5d519 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 14 May 2018 11:11:34 -0300 Subject: [PATCH] Bug 20428: Display warning if the entry is empty And not only if the entry is missing. We should do the same for other entries. Also, use Koha::UploadedFile->temporary_directory to know the fallback value. --- about.pl | 8 +++++--- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/about.pl b/about.pl index 308737debd..70900dd2c4 100755 --- a/about.pl +++ b/about.pl @@ -47,6 +47,7 @@ use Koha::Caches; use Koha::Config::SysPrefs; use Koha::Illrequest::Config; use Koha::SearchEngine::Elasticsearch; +use Koha::UploadedFiles; use C4::Members::Statistics; @@ -261,10 +262,11 @@ if ( ! defined C4::Context->config('upload_path') ) { } } -if ( ! defined C4::Context->config('tmp_path') ) { +if ( ! C4::Context->config('tmp_path') ) { + my $temporary_directory = Koha::UploadedFile->temporary_directory; push @xml_config_warnings, { - error => 'tmp_path_entry_missing', - effective_tmp_dir => File::Spec->tmpdir + error => 'tmp_path_missing', + effective_tmp_dir => $temporary_directory, } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index a3e7bf74e6..6c67f27e5f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -414,7 +414,7 @@ Also note that you need to properly set the OPACBaseURL preference for the file upload plugin to work. - [% ELSIF config_entry.error == 'tmp_path_entry_missing' %] + [% ELSIF config_entry.error == 'tmp_path_missing' %] Warning You are missing the <tmp_path> entry in your koha-conf.xml file. Please -- 2.11.0