[Rt-commit] rt branch, 4.4/fix-durationasstring-mismerge, created. rt-4.4.0rc1-4-g5ea7017

[Shawn Moore]

The branch, 4.4/fix-durationasstring-mismerge has been created
        at  5ea7017aa7a8b45b5b75962ce6fa113522b36f3d (commit)

- Log -----------------------------------------------------------------
commit 5ea7017aa7a8b45b5b75962ce6fa113522b36f3d
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Mon Nov 16 11:09:22 2015 -0500

    Fix mismerge of _DurationAsString
    
        We shifted off $self, so use it instead of $_[0] for ->loc

diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
index bb4cf2c..e7df03c 100644
--- a/lib/RT/Ticket.pm
+++ b/lib/RT/Ticket.pm
@@ -1368,10 +1368,10 @@ sub _DurationAsString {
     my $value = shift;
     return "" unless $value;
     if ($value < 60) {
-        return $_[0]->loc("[quant,_1,minute,minutes]", $value);
+        return $self->loc("[quant,_1,minute,minutes]", $value);
     } else {
         my $h = sprintf("%.2f", $value / 60 );
-        return $_[0]->loc("[quant,_1,hour,hours] ([quant,_2,minute,minutes])", $h, $value);
+        return $self->loc("[quant,_1,hour,hours] ([quant,_2,minute,minutes])", $h, $value);
     }
 }
 

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