summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Constants.pm2
-rw-r--r--Bugzilla/Install/Filesystem.pm5
-rwxr-xr-xBugzilla/User/Setting/Skin.pm2
3 files changed, 5 insertions, 4 deletions
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index c872cf77b..0e2635895 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -441,7 +441,7 @@ sub bz_locations {
'localconfig' => "$libpath/$localconfig",
'datadir' => "$libpath/$datadir",
'attachdir' => "$libpath/$datadir/attachments",
- 'skinsdir' => "$libpath/skins/contrib",
+ 'skinsdir' => "$libpath/skins",
# $webdotdir must be in the webtree somewhere. Even if you use a
# local dot, we output images to there. Also, if $webdotdir is
# not relative to the bugzilla root directory, you'll need to
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index e38270032..348f197b6 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -61,6 +61,7 @@ sub FILESYSTEM {
my $webdotdir = bz_locations()->{'webdotdir'};
my $templatedir = bz_locations()->{'templatedir'};
my $libdir = bz_locations()->{'libpath'};
+ my $skinsdir = bz_locations()->{'skinsdir'};
my $ws_group = Bugzilla->localconfig->{'webservergroup'};
@@ -201,9 +202,9 @@ sub FILESYSTEM {
# Each standard stylesheet has an associated custom stylesheet that
# we create.
- foreach my $standard (<skins/standard/*.css>) {
+ foreach my $standard (<$skinsdir/standard/*.css>) {
my $custom = $standard;
- $custom =~ s|^skins/standard|skins/custom|;
+ $custom =~ s|\Q$skinsdir\E/standard|$skinsdir/custom|;
$create_files{$custom} = { perms => $ws_readable, contents => <<EOT
/*
* Custom rules for $standard.
diff --git a/Bugzilla/User/Setting/Skin.pm b/Bugzilla/User/Setting/Skin.pm
index c4858503f..f55e01297 100755
--- a/Bugzilla/User/Setting/Skin.pm
+++ b/Bugzilla/User/Setting/Skin.pm
@@ -33,7 +33,7 @@ sub legal_values {
return $self->{'legal_values'} if defined $self->{'legal_values'};
- my $dirbase = bz_locations()->{'skinsdir'};
+ my $dirbase = bz_locations()->{'skinsdir'} . '/contrib';
# Avoid modification of the list BUILTIN_SKIN_NAMES points to by copying the
# list over instead of simply writing $legal_values = BUILTIN_SKIN_NAMES.
my @legal_values = @{(BUILTIN_SKIN_NAMES)};