From ab5717cbb420d47b3de56fcc77e3bc4a1f66b32b Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Thu, 15 Feb 2024 13:27:50 -0100 Subject: [PATCH] Bug 32693: Preparation: About script: docdir docdir is used in both team + history tabs was previously being loaded in team and additionally used in history but because now we're only loading one tab at a time, we need to move this Signed-off-by: David Nind Signed-off-by: Jonathan Druart --- about.pl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/about.pl b/about.pl index 218c384b389..d533e1e30eb 100755 --- a/about.pl +++ b/about.pl @@ -70,6 +70,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); +my $docdir; +if ( defined C4::Context->config('docdir') ) { + $docdir = C4::Context->config('docdir'); +} else { + + # if no is defined in koha-conf.xml, use the default location + # this is a work-around to stop breakage on upgraded Kohas, bug 8911 + $docdir = C4::Context->config('intranetdir') . '/docs'; +} + my $config_timezone = C4::Context->config('timezone') // ''; my $config_invalid = !DateTime::TimeZone->is_valid_name( $config_timezone ); my $env_timezone = $ENV{TZ} // ''; @@ -737,14 +747,6 @@ $template->param( table => $table ); ## ------------------------------------------ ## Koha contributions -my $docdir; -if ( defined C4::Context->config('docdir') ) { - $docdir = C4::Context->config('docdir'); -} else { - # if no is defined in koha-conf.xml, use the default location - # this is a work-around to stop breakage on upgraded Kohas, bug 8911 - $docdir = C4::Context->config('intranetdir') . '/docs'; -} ## Release teams my $teams = -- 2.34.1