From b32b0020cc9b2323ca2a34ad35b642e343e73f2b Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 12 Jun 2014 02:32:45 -0700 Subject: [PATCH] don't add fuzzy cache upgrade jobs for cust_main 2.3->3.x upgrade, RT#27856 --- FS/FS/contact.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm index 9ce73e1dd..936e82132 100644 --- a/FS/FS/contact.pm +++ b/FS/FS/contact.pm @@ -2,12 +2,15 @@ package FS::contact; use base qw( FS::Record ); use strict; +use vars qw( $skip_fuzzyfiles ); use Scalar::Util qw( blessed ); use FS::Record qw( qsearchs dbh ); # qw( qsearch qsearchs dbh ); use FS::contact_phone; use FS::contact_email; use FS::queue; +$skip_fuzzyfiles = 0; + =head1 NAME FS::contact - Object methods for contact records @@ -161,7 +164,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; @@ -169,7 +172,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 ); @@ -318,7 +321,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; @@ -326,7 +329,7 @@ sub replace { $dbh->rollback if $oldAutoCommit; return "updating fuzzy search cache: $error"; } - #} + } if ( ( $old->selfservice_access eq '' && $self->selfservice_access && ! $self->_password -- 2.11.0