From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 22 Sep 2010 11:57:54 +0000 (+0200)
Subject: Bug 598147: Can't call method "isa" without a package or object reference
X-Git-Tag: bugzilla-4.0rc1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7ea8a7687d6f4f22505e1b9a65a68d499e6b279;p=thirdparty%2Fbugzilla.git

Bug 598147: Can't call method "isa" without a package or object reference
r/a=mkanat
---

diff --git a/email_in.pl b/email_in.pl
index 0382c4e8aa..78ac32ca67 100755
--- a/email_in.pl
+++ b/email_in.pl
@@ -42,6 +42,7 @@ use Email::MIME::Attachment::Stripper;
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
 use Encode;
+use Scalar::Util qw(blessed);
 
 use Bugzilla;
 use Bugzilla::Attachment;
@@ -352,7 +353,8 @@ sub die_handler {
     # In Template-Toolkit, [% RETURN %] is implemented as a call to "die".
     # But of course, we really don't want to actually *die* just because
     # the user-error or code-error template ended. So we don't really die.
-    return if $msg->isa('Template::Exception') && $msg->type eq 'return';
+    return if blessed($msg) && $msg->isa('Template::Exception')
+              && $msg->type eq 'return';
 
     # If this is inside an eval, then we should just act like...we're
     # in an eval (instead of printing the error and exiting).