[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-509-g33a934f

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  33a934fdb37835bea613bd845d217a769c6f16cc (commit)
      from  11f1b9936611966d0cdb07ac8d07aa268e343fb6 (commit)

Summary of changes:
 lib/RT/Config.pm              |    4 ++--
 lib/RT/Test/Web.pm            |    6 +++---
 lib/RT/Transaction_Overlay.pm |    4 ++--
 t/mail/sendmail.t             |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 33a934fdb37835bea613bd845d217a769c6f16cc
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Aug 23 19:42:12 2010 -0400

    "$whatever =~ qr//" is two orders of magnitude slower than "$whatever =~ m//"

diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 016cf36..5e56f7d 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -643,8 +643,8 @@ sub _LoadConfig {
         require $args{'File'};
     };
     if ($@) {
-        return 1 if $is_site && $@ =~ qr{^Can't locate \Q$args{File}};
-        if ( $is_site || $@ !~ qr{^Can't locate \Q$args{File}} ) {
+        return 1 if $is_site && $@ =~ /^Can't locate \Q$args{File}/;
+        if ( $is_site || $@ !~ /^Can't locate \Q$args{File}/ ) {
             die qq{Couldn't load RT config file $args{'File'}:\n\n$@};
         }
 
diff --git a/lib/RT/Test/Web.pm b/lib/RT/Test/Web.pm
index 9e0d2c5..a3fdf0d 100644
--- a/lib/RT/Test/Web.pm
+++ b/lib/RT/Test/Web.pm
@@ -85,7 +85,7 @@ sub login {
         Test::More::diag( "error: status is ". $self->status );
         return 0;
     }
-    unless ( $self->content =~ qr/Logout/i ) {
+    unless ( $self->content =~ m/Logout/i ) {
         Test::More::diag("error: page has no Logout");
         return 0;
     }
@@ -104,7 +104,7 @@ sub logout {
     Test::More::diag( "error: status is ". $self->status )
         unless $self->status == 200;
 
-    if ( $self->content =~ qr/Logout/i ) {
+    if ( $self->content =~ /Logout/i ) {
         $self->follow_link( text => 'Logout' );
         Test::More::diag( "error: status is ". $self->status ." when tried to logout" )
             unless $self->status == 200;
@@ -114,7 +114,7 @@ sub logout {
     }
 
     $self->get($url);
-    if ( $self->content =~ qr/Logout/i ) {
+    if ( $self->content =~ /Logout/i ) {
         Test::More::diag( "error: couldn't logout" );
         return 0;
     }
diff --git a/lib/RT/Transaction_Overlay.pm b/lib/RT/Transaction_Overlay.pm
index c462184..4113c79 100755
--- a/lib/RT/Transaction_Overlay.pm
+++ b/lib/RT/Transaction_Overlay.pm
@@ -434,14 +434,14 @@ sub ContentObj {
     # If it's a multipart object, first try returning the first part with preferred
     # MIME type ('text/plain' by default).
 
-    elsif ( $Attachment->ContentType =~ qr|^multipart/mixed|i ) {
+    elsif ( $Attachment->ContentType =~ m|^multipart/mixed|i ) {
         my $kids = $Attachment->Children;
         while (my $child = $kids->Next) {
             my $ret =  $self->ContentObj(%args, Attachment => $child);
             return $ret if ($ret);
         }
     }
-    elsif ( $Attachment->ContentType =~ qr|^multipart/|i ) {
+    elsif ( $Attachment->ContentType =~ m|^multipart/|i ) {
         if ( $args{Type} ) {
             my $plain_parts = $Attachment->Children;
             $plain_parts->ContentType( VALUE => $args{Type} );
diff --git a/t/mail/sendmail.t b/t/mail/sendmail.t
index 1f97bbb..7b6db93 100644
--- a/t/mail/sendmail.t
+++ b/t/mail/sendmail.t
@@ -414,7 +414,7 @@ sub text_plain_nested_redef_sendmessage {
                  $subject  = MIME::Base64::decode_base64( $subject);
                 chomp($subject);
                 # TODO, why does this test fail
-                #ok($subject =~ qr{Niv\x{e5}er}, "The subject matches the word - $subject");
+                #ok($subject =~ /Niv\x{e5}er/, "The subject matches the word - $subject");
                 1;
                  }';
 }

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