[freeside-commits] branch FREESIDE_3_BRANCH updated. ecb3c59b93784914764d5b73ed1f5ab53dd165d3

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  ecb3c59b93784914764d5b73ed1f5ab53dd165d3 (commit)
      from  4f226e22cd720cadd7aa854eb915e7af1bab90e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ecb3c59b93784914764d5b73ed1f5ab53dd165d3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Jun 12 02:32:50 2014 -0700

    don't add fuzzy cache upgrade jobs for cust_main 2.3->3.x upgrade, RT#27856

diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm
index 4a1fb39..b025892 100644
--- a/FS/FS/contact.pm
+++ b/FS/FS/contact.pm
@@ -2,6 +2,7 @@ package FS::contact;
 use base qw( FS::Record );
 
 use strict;
+use vars qw( $skip_fuzzyfiles );
 use Scalar::Util qw( blessed );
 use FS::Record qw( qsearch qsearchs dbh );
 use FS::prospect_main;
@@ -13,6 +14,8 @@ use FS::contact_email;
 use FS::queue;
 use FS::cust_pkg;
 
+$skip_fuzzyfiles = 0;
+
 =head1 NAME
 
 FS::contact - Object methods for contact records
@@ -166,7 +169,7 @@ sub insert {
 
   }
 
-  #unless ( $import || $skip_fuzzyfiles ) {
+  unless ( $skip_fuzzyfiles ) { #unless ( $import || $skip_fuzzyfiles ) {
     #warn "  queueing fuzzyfiles update\n"
     #  if $DEBUG > 1;
     $error = $self->queue_fuzzyfiles_update;
@@ -174,7 +177,7 @@ sub insert {
       $dbh->rollback if $oldAutoCommit;
       return "updating fuzzy search cache: $error";
     }
-  #}
+  }
 
   if ( $self->selfservice_access ) {
     my $error = $self->send_reset_email( queue=>1 );
@@ -323,7 +326,7 @@ sub replace {
 
   }
 
-  #unless ( $import || $skip_fuzzyfiles ) {
+  unless ( $skip_fuzzyfiles ) { #unless ( $import || $skip_fuzzyfiles ) {
     #warn "  queueing fuzzyfiles update\n"
     #  if $DEBUG > 1;
     $error = $self->queue_fuzzyfiles_update;
@@ -331,7 +334,7 @@ sub replace {
       $dbh->rollback if $oldAutoCommit;
       return "updating fuzzy search cache: $error";
     }
-  #}
+  }
 
   if (    ( $old->selfservice_access eq '' && $self->selfservice_access
               && ! $self->_password

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

Summary of changes:
 FS/FS/contact.pm |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)