From 374f8e5762831ebcb2b1ea1f33bc9014f33049f2 Mon Sep 17 00:00:00 2001
From: Frank Dillon <frank@plainblack.com>
Date: Mon, 17 Nov 2008 23:57:00 +0000
Subject: [PATCH] Fixed a problem in error reporting in the saveSettings method

---
 lib/WebGUI/Operation/Settings.pm | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index ac5578d08..5996b3fa8 100755
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -406,31 +406,6 @@ sub definition {
                 defaultValue=>$setting->get("passiveProfilingEnabled"),
                 extras=>'onchange="alert(\''.$i18n->get("Illegal Warning").'\')" '
 		});
-    push(@fields, {
-        tab=>"user",
-        fieldType=>"yesNo",
-        name=>"userInvitationsEnabled",
-        label=>$i18n->get("Enable user invitations"),
-        hoverHelp=>$i18n->get("Enable user invitations description"),
-        defaultValue=>$setting->get("userInvitationsEnabled"),
-    });
-    push(@fields, {
-        tab=>"user",
-        fieldType=>"textarea",
-        name=>"userInvitationsEmailExists",
-        label=>$i18n->get("user invitations email exists"),
-        hoverHelp=>$i18n->get("user invitations email exists description"),
-        defaultValue=>$setting->get("userInvitationsEmailExists"),
-    });
-    push(@fields, {
-		tab=>"user",
-		fieldType=>"template",
-		name=>"userInvitationsEmailTemplateId",
-		label=>$i18n->get('user email template'),
-		hoverHelp=>$i18n->get('user email template description'),
-		namespace=>"userInvite/Email",
-		defaultValue=>$setting->get("userInvitationsEmailTemplateId"),
-		});    
     push @fields, {
         tab             => "user",
         name            => "showMessageOnLogin",
@@ -675,8 +650,8 @@ sub www_saveSettings {
         #Save the settings
         eval { $instance->editSettingsFormSave };
         
-        if( my $e = WebGUI::Error->caught ) {
-            $session->log->warn("Error calling editSettingsFormSave in $className...skipping : ".$e->error);
+        if( $@ ) {
+            $session->log->warn("Error calling editSettingsFormSave in $className...skipping : ".$@);
             next;
         }
 	}