[Rt-commit] rt branch, 4.2/previewscripmessages-regression, updated. rt-4.2.0-28-ga64343d

[Alex Vandiver]

The branch, 4.2/previewscripmessages-regression has been updated
       via  a64343de9ff2cfca0bb9f65ae1cf354983e67af4 (commit)
      from  efc62aaf565d9e66f2cf5a4ef15acac4809907bd (commit)

Summary of changes:
 lib/RT/ScripAction.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit a64343de9ff2cfca0bb9f65ae1cf354983e67af4
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Oct 31 18:43:40 2013 -0400

    Fix ->TemplateObj to be back-compatible
    
    Returning undef is only appropriate if we cannot determine the
    TemplateObj, which is only the case if we have stored neither
    TemplateObj nor Template.  In most cases, TemplateObj was stored on the
    object when ->LoadAction was called.

diff --git a/lib/RT/ScripAction.pm b/lib/RT/ScripAction.pm
index 901266c..c7e0a19 100644
--- a/lib/RT/ScripAction.pm
+++ b/lib/RT/ScripAction.pm
@@ -193,8 +193,8 @@ sub TemplateObj {
         Remove => "4.4",
     );
 
-    return undef unless $self->{Template};
     if ( !$self->{'TemplateObj'} ) {
+        return undef unless $self->{Template};
         $self->{'TemplateObj'} = RT::Template->new( $self->CurrentUser );
         $self->{'TemplateObj'}->Load( $self->{'Template'} );
 

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