X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=c8c0d4471c1b1a63928399dae38697a3f8c874f5;hb=02d73ef84103d6bdaf49e6a179a0ad46f9719d25;hp=8e6a1f1325f8748aa1b28357a87b733fa2266906;hpb=fad1695f2df61d3fadc5d6fc85527e09d083bf20;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 8e6a1f132..c8c0d4471 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -11,6 +11,7 @@ use FS::Record qw(qsearchs qsearch str2time_sql);
 use FS::queue;
 use FS::upgrade_journal;
 use FS::Setup qw( enable_banned_pay_pad );
+use FS::DBI;
 
 use FS::svc_domain;
 $FS::svc_domain::whois_hack = 1;
@@ -205,6 +206,13 @@ If you need to continue using the old Form 477 report, turn on the
     FS::upgrade_journal->set_done('deprecate_unmask_ss');
   }
 
+  # Rename agent-disable_counts as config-disable_counts, flag now
+  # affects several configuration pages
+  for my $row ( qsearch( conf => { name => 'agent-disable_counts' } )) {
+    $row->name('config-disable_counts');
+    $row->replace;
+  }
+
 }
 
 sub upgrade_overlimit_groups {
@@ -636,11 +644,11 @@ sub upgrade_sqlradius {
     my $errmsg = 'Error adding FreesideStatus to '.
                  $part_export->option('datasrc'). ': ';
 
-    my $dbh = DBI->connect(
+    my $dbh = FS::DBI->connect(
       ( map $part_export->option($_), qw ( datasrc username password ) ),
       { PrintError => 0, PrintWarn => 0 }
     ) or do {
-      warn $errmsg.$DBI::errstr;
+      warn $errmsg.$FS::DBI::errstr;
       next;
     };