Bug 696537: Load DateTime only when datetime_from() is called

r/a=mkanat

2 files changed, 4 insertions, 2 deletions

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index d158be1e1..1f698f80e 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -50,8 +50,6 @@ use Bugzilla::RNG qw(irand);
 
 use Date::Parse;
 use Date::Format;
-use DateTime;
-use DateTime::TimeZone;
 use Digest;
 use Email::Address;
 use List::Util qw(first);
@@ -485,6 +483,9 @@ sub datetime_from {
         delete $args{$arg} if !defined $args{$arg};
     }
 
+    # This module takes time to load and is only used here, so we
+    # |require| it here rather than |use| it.
+    require DateTime;
     my $dt = new DateTime(\%args);
 
     # Now display the date using the given timezone,
diff --git a/mod_perl.pl b/mod_perl.pl
index 2f4016952..fb597d744 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -39,6 +39,7 @@ use Apache2::Log ();
 use Apache2::ServerUtil;
 use ModPerl::RegistryLoader ();
 use File::Basename ();
+use DateTime ();
 
 # This loads most of our modules.
 use Bugzilla ();