[Rt-commit] rt branch, master, updated. rt-4.2.12-505-g5780495

[Dustin Graves]

The branch, master has been updated
       via  578049526ec53b537ba20cc08740b54a70316eba (commit)
      from  ff02eb09e1ded53fd8f1984ea852f131a4517c48 (commit)

Summary of changes:
 lib/RT/Ticket.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 578049526ec53b537ba20cc08740b54a70316eba
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);
     }
 }
 

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