From 2e3a5735240ad3bc777e245bf1ce1505e3579fda Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 29 Feb 2012 17:15:57 +0100
Subject: Bug 731175: Bugzilla::Field shouldn't assume that someone else
 already loaded required modules r=glob a=LpSolit

---
 Bugzilla/Field/Choice.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Bugzilla/Field/Choice.pm')

diff --git a/Bugzilla/Field/Choice.pm b/Bugzilla/Field/Choice.pm
index b4666a27c..8c5873fdb 100644
--- a/Bugzilla/Field/Choice.pm
+++ b/Bugzilla/Field/Choice.pm
@@ -76,8 +76,10 @@ sub type {
     my $field_obj = blessed $field ? $field : Bugzilla::Field->check($field);
     my $field_name = $field_obj->name;
 
-    if ($class->CLASS_MAP->{$field_name}) {
-        return $class->CLASS_MAP->{$field_name};
+    if (my $package = $class->CLASS_MAP->{$field_name}) {
+        # Callers expect the module to be already loaded.
+        eval "require $package";
+        return $package;
     }
 
     # For generic classes, we use a lowercase class name, so as
-- 
cgit v1.2.3-24-g4f1b