X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUID.pm;h=4ea2ecdeb5544a2360bb0b16126e6ccb9d2d38ca;hb=b598110ef2b48c220191aa581596cadac4ae51d7;hp=9c52f08834e995f8eef285f9dcdbf0b91ebd4e64;hpb=63973c641c4be00765fa27e55c57cc5b9aa4da19;p=freeside.git

diff --git a/FS/FS/UID.pm b/FS/FS/UID.pm
index 9c52f0883..4ea2ecdeb 100644
--- a/FS/FS/UID.pm
+++ b/FS/FS/UID.pm
@@ -74,7 +74,6 @@ sub adminsuidsetup {
 
 sub forksuidsetup {
   my $user = shift;
-  my $olduser = $user;
   warn "$me forksuidsetup starting for $user\n" if $DEBUG;
 
   if ( $FS::CurrentUser::upgrade_hack ) {
@@ -88,7 +87,7 @@ sub forksuidsetup {
 
   env_setup();
 
-  db_setup($olduser);
+  db_setup();
 
   callback_setup();
 
@@ -118,16 +117,11 @@ sub env_setup {
 }
 
 sub db_setup {
-  my $olduser = shift;
-
   croak "Not running uid freeside (\$>=$>, \$<=$<)\n" unless checkeuid();
 
   warn "$me forksuidsetup connecting to database\n" if $DEBUG;
-  if ( $FS::CurrentUser::upgrade_hack && $olduser ) {
-    $dbh = &myconnect($olduser);
-  } else {
-    $dbh = &myconnect();
-  }
+  $dbh = &myconnect();
+
   warn "$me forksuidsetup connected to database with handle $dbh\n" if $DEBUG;
 
   warn "$me forksuidsetup loading schema\n" if $DEBUG;
@@ -182,6 +176,8 @@ sub myconnect {
                            )
     or die "DBI->connect error: $DBI::errstr\n";
 
+  $FS::Conf::conf_cache = undef;
+
   if ( $schema ) {
     use DBIx::DBSchema::_util qw(_load_driver ); #quelle hack
     my $driver = _load_driver($handle);