diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 07:04:18 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 07:04:18 +0200 |
| commit | 597ac85a2a4219cb8cb6d916414e47a3abfa8c72 (patch) | |
| tree | 1d01a86c4a32981a20016fa2204561588c96ea32 /Bugzilla/Template.pm | |
| parent | be1f92450788dc89280c9e04a4bf983b5d7fac54 (diff) | |
| parent | fbdbbe2d0dc333fdd6fb547254d2cab57ed3bc98 (diff) | |
| download | bugzilla-597ac85a2a4219cb8cb6d916414e47a3abfa8c72.tar.gz bugzilla-597ac85a2a4219cb8cb6d916414e47a3abfa8c72.tar.xz | |
Merge remote-tracking branch 'dylanwh/mojo-poc'
Diffstat (limited to 'Bugzilla/Template.pm')
| -rw-r--r-- | Bugzilla/Template.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 107c457c6..e54877e9b 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -571,7 +571,7 @@ sub create { # if a packager has modified bz_locations() to contain absolute # paths. ABSOLUTE => 1, - RELATIVE => 1, + RELATIVE => $ENV{SERVER_SOFTWARE} ? 0 : 1, # Only use an on-disk template cache if we're running as the web # server. This ensures the permissions of the cache remain correct. @@ -1042,7 +1042,11 @@ sub create { # under mod_perl, use a provider (template loader) that preloads all templates into memory my $provider_class +<<<<<<< HEAD = BZ_PERSISTENT +======= + = $opts{preload} +>>>>>>> dylanwh/mojo-poc ? 'Bugzilla::Template::PreloadProvider' : 'Template::Provider'; |