[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.3-34-g0574548

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  05745481dda6c3d4c940de7f9a1fbb5d55e09ef3 (commit)
       via  bca61e65151a7aeda47b6d3132ccf5d41db9eece (commit)
      from  59d5f0e8e2caf4e3cc1d3036fa0cf71fad932444 (commit)

Summary of changes:
 etc/upgrade/time-worked-history.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit bca61e65151a7aeda47b6d3132ccf5d41db9eece
Author: Christian Loos <cloos at netcologne.de>
Date:   Mon Mar 17 12:22:59 2014 +0100

    fix uninitialized warning if $txn->Field isn't set

diff --git a/etc/upgrade/time-worked-history.pl b/etc/upgrade/time-worked-history.pl
index 67ee104..46961aa 100644
--- a/etc/upgrade/time-worked-history.pl
+++ b/etc/upgrade/time-worked-history.pl
@@ -86,7 +86,7 @@ sub fix_time_worked_history {
         } elsif ( $txn->Type eq 'Set' && $txn->Field eq 'TimeWorked' ) {
             $history += $txn->NewValue - $txn->OldValue;
             $candidate = $txn;
-        } elsif ( $candidate && $txn->Field eq 'MergedInto' ) {
+        } elsif ( $candidate && ($txn->Field||'') eq 'MergedInto' ) {
             if ($candidate->Creator eq $txn->Creator ) {
                 push @delete, $candidate;
                 $delete_time += $candidate->NewValue - $candidate->OldValue;

commit 05745481dda6c3d4c940de7f9a1fbb5d55e09ef3
Merge: 59d5f0e bca61e6
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Mar 19 10:18:17 2014 -0400

    Merge branch '4.2/time-worked-history-uninit-warning' into 4.2-trunk


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