Merge branch '4.2/zero-attachments-in-forward-txns' into 4.2.11-releng

bestpractical · Apr 28, 2015 · 62de9fe · 62de9fe
2 parents a7a5261 + 5c774cb
commit 62de9fe
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/etc/upgrade/4.2.11/content b/etc/upgrade/4.2.11/content
@@ -44,6 +44,7 @@ EOSQL
         $txns->Limit( FIELD => 'Type', VALUE => 'Forward Ticket' );
         while ( my $txn = $txns->Next ) {
             my $att = $txn->Attachments->First;
+            next unless $att;
 
             # we only need to process ascii-only strings
             unless ( $att->Subject =~ /[^\x00-\x7F]/ ) {