Bug 376908: Installation process should not assume skins are in the same directory...

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index fc81014351341d5076825c4897c92b223bacce57..57ed8dfa0c383e639df4705864c9e057cf60c4da 100644 (file)
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -426,7 +426,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 c13df2893e65a03e97f3321df76e0f9f92be530d..d5b8a58c45158e2c9dd51c7f7c186b965213e7f0 100644 (file)
--- 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'};
 
@@ -200,9 +201,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 c4858503fd98b9681c3864982e133aa00d833f99..f55e01297dc75842ecce64719b92cf2453591bc2 100755 (executable)
--- 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)};