[Rt-commit] r12808 - in rt/branches/3.8-TESTING: . lib/RT/Interface

[alexmv at bestpractical.com]

Author: alexmv
Date: Mon Jun  2 14:53:57 2008
New Revision: 12808

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/lib/RT/Interface/Web.pm
   rt/branches/3.8-TESTING/share/html/Elements/GnuPG/SignEncryptWidget

Log:
 r32377 at kohr-ah:  chmrr | 2008-06-02 14:53:25 -0400
  * Warnings avoidance


Modified: rt/branches/3.8-TESTING/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Interface/Web.pm	Mon Jun  2 14:53:57 2008
@@ -568,7 +568,8 @@
         my $sig = $args{'TicketObj'}->CurrentUser->UserObj->Signature || '';
         $sig =~ s/^\s*|\s*$//g;
         if ($args{ARGSRef}->{'UpdateContent'} =~ /^\s*(--)?\s*\Q$sig\E\s*$/
-            or (    $args{ARGSRef}->{'UpdateContentType'} eq "text/html"
+            or (    defined $args{ARGSRef}->{'UpdateContentType'}
+                and $args{ARGSRef}->{'UpdateContentType'} eq "text/html"
                 and $args{ARGSRef}->{'UpdateContent'}
                 =~ /^\s*<p>\s*(--)?\s*<br\s*\/?>\s*\Q$sig\E\s*<\/p>\s*$/ )
             )

Modified: rt/branches/3.8-TESTING/share/html/Elements/GnuPG/SignEncryptWidget
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Elements/GnuPG/SignEncryptWidget	(original)
+++ rt/branches/3.8-TESTING/share/html/Elements/GnuPG/SignEncryptWidget	Mon Jun  2 14:53:57 2008
@@ -125,7 +125,7 @@
         if $TicketObj;
 
     my $address = $self->{'SignUsing'};
-    $address ||= $self->{'UpdateType'} eq "private"
+    $address ||= (defined $self->{'UpdateType'} and $self->{'UpdateType'} eq "private")
         ? ( $QueueObj->CommentAddress || RT->Config->Get('CommentAddress') )
         : ( $QueueObj->CorrespondAddress || RT->Config->Get('CorrespondAddress') );