From fdf0bd61ab40a1b4a2f97c61b0c78198d752f91a Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 6 Dec 2011 14:13:23 -0800
Subject: [PATCH] Remove more unnecessary session access to find a config file.

---
 share/upgrades/7.10.23-8.0.0/addI18nMacroAlias.pl  | 2 +-
 share/upgrades/7.10.23-8.0.0/addNewAdminConsole.pl | 8 ++++----
 share/upgrades/7.10.23-8.0.0/addTemplateToolkit.pl | 2 +-
 share/upgrades/7.10.23-8.0.0/removeURLHandlers.pl  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/upgrades/7.10.23-8.0.0/addI18nMacroAlias.pl b/share/upgrades/7.10.23-8.0.0/addI18nMacroAlias.pl
index 27bc509bb..dfa4acf1b 100644
--- a/share/upgrades/7.10.23-8.0.0/addI18nMacroAlias.pl
+++ b/share/upgrades/7.10.23-8.0.0/addI18nMacroAlias.pl
@@ -3,7 +3,7 @@ use WebGUI::Upgrade::Script;
 
 start_step "Adding International macro alias: ^i18n(...);";
 
-session->config->addToHash( 'macros', 'i18n' => 'International' );
+config->addToHash( 'macros', 'i18n' => 'International' );
 
 done;
 
diff --git a/share/upgrades/7.10.23-8.0.0/addNewAdminConsole.pl b/share/upgrades/7.10.23-8.0.0/addNewAdminConsole.pl
index 5b557afb2..bde82bcc1 100644
--- a/share/upgrades/7.10.23-8.0.0/addNewAdminConsole.pl
+++ b/share/upgrades/7.10.23-8.0.0/addNewAdminConsole.pl
@@ -4,16 +4,16 @@ use List::MoreUtils qw( any );
 
 start_step "Adding new Admin Console";
 
-session->config->addToArrayAfter(
+config->addToArrayAfter(
     'contentHandlers', 'WebGUI::Content::Referral', 'WebGUI::Content::Admin'
 );
 
 # Remove irrelevant Admin Console items
-session->config->deleteFromHash( 'adminConsole', 'adminConsoleOff' );
-session->config->deleteFromHash( 'adminConsole', 'assets' );
+config->deleteFromHash( 'adminConsole', 'adminConsoleOff' );
+config->deleteFromHash( 'adminConsole', 'assets' );
 
 # Remove old admin handlers
-session->config->deleteFromArray( 'contentHandlers', 'WebGUI::Content::AssetManager' );
+config->deleteFromArray( 'contentHandlers', 'WebGUI::Content::AssetManager' );
 
 # Add template setting
 session->setting->set( 'templateIdAdmin' => 'p8g7xlQaTeKSRRDo-_ejSQ' );
diff --git a/share/upgrades/7.10.23-8.0.0/addTemplateToolkit.pl b/share/upgrades/7.10.23-8.0.0/addTemplateToolkit.pl
index e5287b444..77017d4cd 100644
--- a/share/upgrades/7.10.23-8.0.0/addTemplateToolkit.pl
+++ b/share/upgrades/7.10.23-8.0.0/addTemplateToolkit.pl
@@ -5,7 +5,7 @@ start_step "Adding Template Toolkit template parser";
 
 my $class = 'WebGUI::Asset::Template::TemplateToolkit';
 unless ( grep { $_ eq $class } @{ session->config->get('templateParsers') } ) {
-    session->config->addToArray( 'templateParsers' => $class );
+    config->addToArray( 'templateParsers' => $class );
 }
 
 done;
diff --git a/share/upgrades/7.10.23-8.0.0/removeURLHandlers.pl b/share/upgrades/7.10.23-8.0.0/removeURLHandlers.pl
index f4eea19e1..5987dcca2 100644
--- a/share/upgrades/7.10.23-8.0.0/removeURLHandlers.pl
+++ b/share/upgrades/7.10.23-8.0.0/removeURLHandlers.pl
@@ -2,7 +2,7 @@ use WebGUI::Upgrade::Script;
 
 start_step "Removing URL Handlers from WebGUI Configuration files";
 
-session->config->delete( 'urlHandlers' );
+config->delete( 'urlHandlers' );
 
 done;