From f2433c30b4ff08c6ddaa6d96d231a8804b9a1a91 Mon Sep 17 00:00:00 2001 From: juju4 Date: Mon, 8 May 2017 21:05:49 -0400 Subject: [PATCH] issue #86 --- lib/Lufi.pm | 8 ++++---- lib/Mounter.pm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Lufi.pm b/lib/Lufi.pm index d53e842..44d8c4f 100755 --- a/lib/Lufi.pm +++ b/lib/Lufi.pm @@ -38,12 +38,12 @@ sub startup { shift @{$self->renderer->paths}; shift @{$self->static->paths}; if ($config->{theme} ne 'default') { - my $theme = $self->home->rel_dir('themes/'.$config->{theme}); + my $theme = $self->home->rel_file('themes/'.$config->{theme}); push @{$self->renderer->paths}, $theme.'/templates' if -d $theme.'/templates'; push @{$self->static->paths}, $theme.'/public' if -d $theme.'/public'; } - push @{$self->renderer->paths}, $self->home->rel_dir('themes/default/templates'); - push @{$self->static->paths}, $self->home->rel_dir('themes/default/public'); + push @{$self->renderer->paths}, $self->home->rel_file('themes/default/templates'); + push @{$self->static->paths}, $self->home->rel_file('themes/default/public'); # Mail config my $mail_config = { @@ -56,7 +56,7 @@ sub startup { $self->plugin('Mail' => $mail_config); # Internationalization - my $lib = $self->home->rel_dir('themes/'.$config->{theme}.'/lib'); + my $lib = $self->home->rel_file('themes/'.$config->{theme}.'/lib'); eval qq(use lib "$lib"); $self->plugin('I18N'); diff --git a/lib/Mounter.pm b/lib/Mounter.pm index 58f350e..9860253 100644 --- a/lib/Mounter.pm +++ b/lib/Mounter.pm @@ -22,10 +22,10 @@ sub startup { # Themes handling shift @{$self->static->paths}; if ($config->{theme} ne 'default') { - my $theme = $self->home->rel_dir('themes/'.$config->{theme}); + my $theme = $self->home->rel_file('themes/'.$config->{theme}); push @{$self->static->paths}, $theme.'/public' if -d $theme.'/public'; } - push @{$self->static->paths}, $self->home->rel_dir('themes/default/public'); + push @{$self->static->paths}, $self->home->rel_file('themes/default/public'); $self->plugin('Mount' => {$config->{prefix} => File::Spec->catfile($Bin, '..', 'script', 'application')}); }