From 628105c410063b83b490c03a18ef16cca96aa32d Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Fri, 24 Aug 2007 03:50:17 +0000 Subject: [PATCH] add more strict condition inside getNewletterTypeEditForm to make NewsleterAdmin more robust. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@40816 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/NewsletterAdmin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/NewsletterAdmin.php b/code/NewsletterAdmin.php index 5ae702f5..d2e41e75 100755 --- a/code/NewsletterAdmin.php +++ b/code/NewsletterAdmin.php @@ -167,8 +167,8 @@ class NewsletterAdmin extends LeftAndMain { if(isset($mailType) && is_object($mailType) && $mailType->GroupID) { $group = DataObject::get_one("Group", "ID = $mailType->GroupID"); } - - if(isset($mailType)) { + //The function could be called from CMS with $mailType isset but with empty string. + if(isset($mailType)&&$mailType) { $fields = new FieldSet( new TextField("Title", "Newsletter Type"), new TextField("FromEmail", "Send newsletters from"),