[Rt-commit] rt branch, 4.0/perl-compat, created. rt-4.0.24-35-gd82a3f9

[Alex Vandiver]

The branch, 4.0/perl-compat has been created
        at  d82a3f9b49d9349ce569a1f5da5f385d2ba3f536 (commit)

- Log -----------------------------------------------------------------
commit b41a13e8555e98283e5e5ad6721931c819ca09d1
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Jun 24 17:37:15 2014 -0400

    Pass the right number of arguments to sprintf

diff --git a/lib/RT/Date.pm b/lib/RT/Date.pm
index f45e422..7e8ae6f 100644
--- a/lib/RT/Date.pm
+++ b/lib/RT/Date.pm
@@ -763,7 +763,7 @@ sub ISO {
     my $res = '';
     $res .= sprintf("%04d-%02d-%02d", $year, $mon, $mday) if $args{'Date'};
     $res .= sprintf(' %02d:%02d', $hour, $min) if $args{'Time'};
-    $res .= sprintf(':%02d', $sec, $min) if $args{'Time'} && $args{'Seconds'};
+    $res .= sprintf(':%02d', $sec) if $args{'Time'} && $args{'Seconds'};
     $res =~ s/^\s+//;
 
     return $res;
@@ -803,7 +803,7 @@ sub W3CDTF {
     $res .= sprintf("%04d-%02d-%02d", $year, $mon, $mday);
     if ( $args{'Time'} ) {
         $res .= sprintf('T%02d:%02d', $hour, $min);
-        $res .= sprintf(':%02d', $sec, $min) if $args{'Seconds'};
+        $res .= sprintf(':%02d', $sec) if $args{'Seconds'};
         if ( $offset ) {
             $res .= sprintf "%s%02d:%02d", $self->_SplitOffset( $offset );
         } else {

commit d82a3f9b49d9349ce569a1f5da5f385d2ba3f536
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Mar 23 21:24:21 2015 +0800

    fix "Unescaped left brace in regex is deprecated" warning with perl 5.21.1+
    
    right braces are also escaped to make it look more consistent.

diff --git a/etc/upgrade/3.8.9/content b/etc/upgrade/3.8.9/content
index d7d64f5..ac6a7e1 100644
--- a/etc/upgrade/3.8.9/content
+++ b/etc/upgrade/3.8.9/content
@@ -53,7 +53,7 @@
 
             # there is only one OwnerObj->Name normally, so no need /g
             if ( $content =~
-s!(?<=Your ticket has been (?:approved|rejected) by { eval { )\$Approval->OwnerObj->Name!\$Approver->Name!
+s!(?<=Your ticket has been (?:approved|rejected) by \{ eval \{ )\$Approval->OwnerObj->Name!\$Approver->Name!
               )
             {
                 $template->SetType('Perl');
diff --git a/t/web/rest.t b/t/web/rest.t
index 3a84b2a..8b8cbcb 100644
--- a/t/web/rest.t
+++ b/t/web/rest.t
@@ -204,7 +204,7 @@ is($link, 1, "Check ticket link.") or diag("'content' obtained:\n", $m->content)
     $text = $m->content;
     $text =~ s/.*?\n\n//;
     $text =~ s/\n\n/\n/;
-    $text =~ s{CF\.{severity}:.*\n}{}img;
+    $text =~ s{CF\.\{severity\}:.*\n}{}img;
     $text .= "CF.{severity}: explosive, a bit\n";
     $m->post(
         "$baseurl/REST/1.0/ticket/edit",
@@ -234,7 +234,7 @@ is($link, 1, "Check ticket link.") or diag("'content' obtained:\n", $m->content)
         ]
     );
     $text = $m->content;
-    $text =~ s{CF\.{severity}:.*\n}{}img;
+    $text =~ s{CF\.\{severity\}:.*\n}{}img;
     $text .= "CF.{severity}:\n";
     $m->post(
         "$baseurl/REST/1.0/ticket/edit",
@@ -301,7 +301,7 @@ is($link, 1, "Check ticket link.") or diag("'content' obtained:\n", $m->content)
         ]
     );
     $text = $m->content;
-    $text =~ s{CF\.{single}:.*\n}{}img;
+    $text =~ s{CF\.\{single\}:.*\n}{}img;
     $text .= "CF.{single}: that\n";
     $m->post(
         "$baseurl/REST/1.0/ticket/edit",

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