[Rt-commit] rt branch, 3.999-trunk, updated. 00313fa85167189c83b429014fce509c91d9a079

[jesse]

The branch, 3.999-trunk has been updated
       via  00313fa85167189c83b429014fce509c91d9a079 (commit)
       via  e503f4712d2d11a96744c72820d9d19d5d4eddf6 (commit)
      from  766db0356ef83099f935c1290d18e56a466024b6 (commit)

Summary of changes:
 lib/RT/Interface/Email/Auth/GnuPG.pm |    3 +--
 lib/RT/Lorzy/Package/RT.pm           |    6 +++---
 lib/RT/Model/Ticket.pm               |    2 +-
 share/html/Admin/Queues/Modify.html  |    4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit e503f4712d2d11a96744c72820d9d19d5d4eddf6
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Oct 5 15:25:54 2009 -0400

    warnings avoidance

diff --git a/lib/RT/Lorzy/Package/RT.pm b/lib/RT/Lorzy/Package/RT.pm
index beeceb9..2f857f2 100644
--- a/lib/RT/Lorzy/Package/RT.pm
+++ b/lib/RT/Lorzy/Package/RT.pm
@@ -45,9 +45,9 @@ __PACKAGE__->defun( 'Condition.OnResolve',
     signature => $sig_ticket_txn,
     native => sub {
         my $args = shift;
-        return $args->{transaction}->type eq 'status'
+        return ($args->{transaction}->type ||'') eq 'status'
             && ( $args->{transaction}->field || '' ) eq 'status'
-            && $args->{transaction}->new_value() eq 'resolved';
+            && ($args->{transaction}->new_value()||'') eq 'resolved';
     },
 );
 
@@ -146,7 +146,7 @@ for my $name ( keys %simple_txn_cond ) {
         signature => $sig_ticket_txn,
         native => sub {
             my $args = shift;
-            return $args->{transaction}->type eq $simple_txn_cond{$name};
+            return ($args->{transaction}->type||'') eq ($simple_txn_cond{$name} ||'');
         },
     );
 }

commit 00313fa85167189c83b429014fce509c91d9a079
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Oct 5 16:05:42 2009 -0400

    Quiet more warnings

diff --git a/lib/RT/Interface/Email/Auth/GnuPG.pm b/lib/RT/Interface/Email/Auth/GnuPG.pm
index c77fd9b..70fdbf3 100644
--- a/lib/RT/Interface/Email/Auth/GnuPG.pm
+++ b/lib/RT/Interface/Email/Auth/GnuPG.pm
@@ -90,9 +90,8 @@ sub get_current_user {
     # _this_ queue. send rejecting mail otherwise.
 
     unless ($status) {
-        Jifty->log->error("Had a problem during decrypting and verifying");
         my $reject = handle_errors( message => $args{'message'}, result => \@res );
-        return ( 0, 'rejected because of problems during decrypting and verifying' )
+        return ( 0, 'rejected because of problems during decryption and verification' )
             if $reject;
     }
 
diff --git a/lib/RT/Model/Ticket.pm b/lib/RT/Model/Ticket.pm
index ccf8e38..09493f8 100755
--- a/lib/RT/Model/Ticket.pm
+++ b/lib/RT/Model/Ticket.pm
@@ -2209,7 +2209,7 @@ sub DESTROY {
         stage           => 'transaction_batch',
         ticket_obj      => $ticket,
         transaction_obj => $batch->[0],
-        type            => join( ',', map $_->type, grep defined, @{$batch} )
+        type            => join( ',', grep defined, map $_->type, grep defined, @{$batch} )
     );
     RT::Ruleset->commit_rules($rules);
 }
diff --git a/share/html/Admin/Queues/Modify.html b/share/html/Admin/Queues/Modify.html
index 30d2c47..59de733 100755
--- a/share/html/Admin/Queues/Modify.html
+++ b/share/html/Admin/Queues/Modify.html
@@ -76,10 +76,10 @@
 </tr>
 
 <tr><td align="right"><&|/l&>Reply Address</&>:</td>
-<td><input name="correspond_address" value="<% ($create) ? "" : $queue_obj->correspond_address %>" />
+<td><input name="correspond_address" value="<% ($create) ? "" : ($queue_obj->correspond_address||'') %>" />
 <br /><span><em><&|/l , RT->config->get('correspond_address')&>(If left blank, will default to %1)</&></em></span></td>
 <td align="right"><&|/l&>comment Address</&>:</td>
-<td><input name="comment_address" value="<% ($create) ? "" : $queue_obj->comment_address %>" />
+<td><input name="comment_address" value="<% ($create) ? "" : ($queue_obj->comment_address||'') %>" />
 <br /><span><em><&|/l , (RT->config->get('comment_address')||'')&>(If left blank, will default to %1)</&></em></span></td>
 </tr>
 

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