[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-39-gf11ee43

[Shawn Moore]

The branch, 3.9-trunk has been updated
       via  f11ee435fe035efcf521bc7a68d1f7f20b5a3d22 (commit)
      from  35e9f5c85bfcd6ca20d7b961cb32f6ab03cfd68f (commit)

Summary of changes:
 lib/RT/ScripAction_Overlay.pm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit f11ee435fe035efcf521bc7a68d1f7f20b5a3d22
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Thu Sep 30 17:42:42 2010 -0400

    Pass along the ($ok, $msg) from ScripAction->Load
    
        Otherwise when we fail to load a scripaction, we get undef
        warnings

diff --git a/lib/RT/ScripAction_Overlay.pm b/lib/RT/ScripAction_Overlay.pm
index e36e175..e53d23f 100755
--- a/lib/RT/ScripAction_Overlay.pm
+++ b/lib/RT/ScripAction_Overlay.pm
@@ -124,11 +124,12 @@ sub Load  {
 	return (0, $self->loc('Input error'));
     }	    
     
+    my ($ok, $msg);
     if ($identifier !~ /\D/) {
-	$self->SUPER::Load($identifier);
+	($ok, $msg) = $self->SUPER::Load($identifier);
     }
     else {
-	$self->LoadByCol('Name', $identifier);
+	($ok, $msg) = $self->LoadByCol('Name', $identifier);
 	
     }
 
@@ -138,7 +139,8 @@ sub Load  {
 	
 	$self->{'Template'} = $template;
     }
-    return ($self->Id, ($self->loc('[_1] ScripAction loaded', $self->Id)));
+
+    return ($ok, $msg);
 }
 
 

-----------------------------------------------------------------------