From 6f272a16b2eb6d200402489b26435eea282ec622 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Fri, 23 Oct 2020 18:17:49 +0200 Subject: [PATCH] Bug 26803: Fix PLUGIN_DIR when plugin_dirs is multivalued When plugin_dir koha-conf.xml parameter contains more than one directory, PLUGIN_DIR parameter sent to templates doesn't contain the proper value, ie the base directory of the current plugin. See bug 23237 Signed-off-by: Arthur Suzuki Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart --- Koha/Plugins/Base.pm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Koha/Plugins/Base.pm b/Koha/Plugins/Base.pm index f1990aea45..a5cb15e3c1 100644 --- a/Koha/Plugins/Base.pm +++ b/Koha/Plugins/Base.pm @@ -167,7 +167,7 @@ sub get_template { CLASS => $self->{'class'}, METHOD => scalar $self->{'cgi'}->param('method'), PLUGIN_PATH => $self->get_plugin_http_path(), - PLUGIN_DIR => $self->get_plugin_dir(), + PLUGIN_DIR => $self->bundle_path(), LANG => C4::Languages::getlanguage($self->{'cgi'}), ); @@ -215,22 +215,6 @@ sub get_plugin_http_path { return "/plugin/" . join( '/', split( '::', $self->{'class'} ) ); } -=head2 get_plugin_dir - -To [% INCLUDE %] another TT template from a template, an absolute path to the -template is required. This method returns that absolute file system path. - -usage: my $path = $self->get_plugin_dir(); - -=cut - -sub get_plugin_dir { - my ($self) = @_; - - my $base = C4::Context->config('pluginsdir'); - return "$base/" . join( '/', split( '::', $self->{'class'} ) ); -} - =head2 go_home go_home is a quick redirect to the Koha plugins home page -- 2.39.5