--- lib/MT/App/CMS.pm.bak	Wed Sep 14 17:49:04 2005
+++ lib/MT/App/CMS.pm	Thu Sep 22 20:13:48 2005
@@ -7154,6 +7154,7 @@
         if ($do_replace) {
             %replace_cols = map { $_ => 1 } @{$api->{replace_cols}};
         }
+        my $search_re = qr/$search/;
         while (my $obj = $iter->()) {
             next unless $author->is_superuser || $api->{perm_check}->($obj);
             my $match = 0;
@@ -7163,12 +7164,12 @@
                     my $text = $obj->$col();
                     $text = '' unless defined $text;
                     if ($do_replace) {
-                        if ($text =~ s!$search!$replace!go) {
+                        if ($text =~ s!$search_re!$replace!g) {
                             $match++;
                             $obj->$col($text);
                         }
                     } else {
-                        eval "$match = $text =~ m!$search!o;";
+                        eval {$match = $text =~ m!$search_re!;};
                         if ($@) {
                             $match = 0;
                             last;