summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-04-08 19:34:03 +0200
committerDylan William Hardison <dylan@hardison.net>2018-04-08 19:34:03 +0200
commit58f390084b0112a286728e631c3f5ebd34128c32 (patch)
tree822898e31a722951cfe03dcb94145ad012ab11f6
parent870c27f502a225320b97b887d9affce6de76ce5e (diff)
downloadbugzilla-58f390084b0112a286728e631c3f5ebd34128c32.tar.gz
bugzilla-58f390084b0112a286728e631c3f5ebd34128c32.tar.xz
revert differences from bmo that are not needed
-rw-r--r--Bugzilla/Template.pm2
-rw-r--r--mod_perl.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 20cdaa3ab..e6b4e551d 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -928,7 +928,7 @@ sub create {
'sudoer' => sub { return Bugzilla->sudoer; },
# Allow templates to access the "corect" URLBase value
- 'urlbase' => sub { Bugzilla->urlbase },
+ 'urlbase' => sub { return Bugzilla->localconfig->{urlbase}; },
# Allow templates to access docs url with users' preferred language
'docs_urlbase' => sub {
diff --git a/mod_perl.pl b/mod_perl.pl
index c64352600..a49af6b80 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -176,7 +176,7 @@ sub handler : method {
DB::disable_profile();
DB::finish_profile();
}
- #warn "[request_time] ", Bugzilla->cgi->request_uri, " took ", Time::HiRes::time() - $start, " seconds to execute";
+ warn "[request_time] ", Bugzilla->cgi->request_uri, " took ", Time::HiRes::time() - $start, " seconds to execute";
# When returning data from the REST api we must only return 200 or 304,
# which tells Apache not to append its error html documents to the