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

1 files changed, 8 insertions, 5 deletions

diff --git a/rt/etc/upgrade/3.8.0/content b/rt/etc/upgrade/3.8.0/content
index 4fa5ac7d8..ae3a9fc0b 100644
--- a/rt/etc/upgrade/3.8.0/content
+++ b/rt/etc/upgrade/3.8.0/content
@@ -1,21 +1,24 @@
-@Final = (
+use strict;
+use warnings;
+
+our @Final = (
     # by incident we've changed 'My Bookmarks' to 'Bookmarked Tickets' when
     # 3.7.82 upgrade script still was creating 'My Bookmarks', try to fix it
     sub {
-        $RT::Logger->debug("Going to rename 'My Bookmarks' to 'Bookmarked Tickets'");
+        RT->Logger->debug("Going to rename 'My Bookmarks' to 'Bookmarked Tickets'");
         my $sys = RT::System->new(RT->SystemUser);
 
         my $attrs = RT::Attributes->new( RT->SystemUser );
         $attrs->LimitToObject( $sys );
         my ($attr) = $attrs->Named( 'Search - My Bookmarks' );
         unless ($attr) {
-            $RT::Logger->debug("You have no global search 'My Bookmarks'. Skipped.");
+            RT->Logger->debug("You have no global search 'My Bookmarks'. Skipped.");
             return 1;
         }
         my ($status, $msg) = $attr->SetName( 'Search - Bookmarked Tickets' );
-        $RT::Logger->error($msg) and return undef unless $status;
+        RT->Logger->error($msg) and return undef unless $status;
 
-        $RT::Logger->debug("Renamed.");
+        RT->Logger->debug("Renamed.");
         return 1;
     },
 );