Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / rt / etc / upgrade / 3.9.8 / content

diff --git a/rt/etc/upgrade/3.9.8/content b/rt/etc/upgrade/3.9.8/content
index d759db9..e9a1a32 100644 (file)
--- a/rt/etc/upgrade/3.9.8/content
+++ b/rt/etc/upgrade/3.9.8/content
@@ -1,9 +1,9 @@
-@Initial = sub {
-    my $dbh = $RT::Handle->dbh;
-    my $sth = $dbh->table_info( '', undef, undef, "'TABLE'");
+use strict;
+use warnings;
+
+our @Initial = sub {
     my $found_fm_tables = {};
-    while ( my $table = $sth->fetchrow_hashref ) {
-        my $name = $table->{TABLE_NAME} || $table->{table_name};
+    foreach my $name ( $RT::Handle->_TableNames ) {
         next unless $name =~ /^fm_/i;
         $found_fm_tables->{lc $name}++;
     }
@@ -11,14 +11,15 @@
     return unless %$found_fm_tables;
 
     unless ( $found_fm_tables->{fm_topics} && $found_fm_tables->{fm_objecttopics} ) {
-        $RT::Logger->error("You appear to be upgrading from RTFM 2.0 - We don't support upgrading this old of an RTFM yet");
+        RT->Logger->error("You appear to be upgrading from RTFM 2.0 - We don't support upgrading this old of an RTFM yet");
     }
 
-    $RT::Logger->error("We found RTFM tables in your database.  Checking for content.");
+    RT->Logger->error("We found RTFM tables in your database.  Checking for content.");
 
+    my $dbh = $RT::Handle->dbh;
     my $result = $dbh->selectall_arrayref("SELECT count(*) AS articlecount FROM FM_Articles", { Slice => {} } );
 
     if ($result->[0]{articlecount} > 0) {
-        $RT::Logger->error("You appear to have RTFM Articles.  You can upgrade using the etc/upgrade/upgrade-articles script.  Read more about it in UPGRADING");
+        RT->Logger->error("You appear to have RTFM Articles.  You can upgrade using the /opt/rt4/etc/upgrade/upgrade-articles script.  Read more about it in docs/UPGRADING-4.0");
     }
 };