From 66fdc3dd1b4b7757a96335d9679ca8a7c016a2d3 Mon Sep 17 00:00:00 2001
From: Jay Allen <jay@endevver.com>
Date: Tue, 25 Jan 2011 15:03:47 -0800
Subject: [PATCH] [#691] Grouping MT package variables together so they're more
 obvious for later elimination when refactoring

---
 lib/MT.pm | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/MT.pm b/lib/MT.pm
index dc150b4da..5e0ae12be 100644
--- a/lib/MT.pm
+++ b/lib/MT.pm
@@ -19,14 +19,13 @@ our ( $PRODUCT_NAME, $PRODUCT_CODE, $PRODUCT_VERSION, $VERSION_ID,
       $PORTAL_URL );
 our ( $MT_DIR, $APP_DIR, $CFG_DIR, $CFG_FILE, $SCRIPT_SUFFIX );
 our (
-      $plugin_sig, $plugin_envelope, $plugin_registry,
-      %Plugins,    @Components,      %Components,
-      $DebugMode,  $mt_inst,         %mt_inst
+      $plugin_sig,      %Plugins,    @Components,     $mt_inst,
+      $plugin_envelope, $DebugMode,  %Components,     %mt_inst,
+      $plugin_registry, %CallbackAlias, $plugins_installed
 );
-my %Text_filters;
+my ( %Text_filters, $plugin_full_path, %CallbacksEnabled, @Callbacks );
 
-# For state determination in MT::Object
-our $plugins_installed;
+our $CallbacksEnabled = 1;
 
 BEGIN {
     $plugins_installed = 0;
@@ -558,8 +557,6 @@ sub log {
 
 } ## end sub log
 
-my $plugin_full_path;
-
 sub run_tasks {
     my $mt = shift;
     require MT::TaskMgr;
@@ -632,11 +629,6 @@ sub add_plugin {
     1;
 } ## end sub add_plugin
 
-our %CallbackAlias;
-our $CallbacksEnabled = 1;
-my %CallbacksEnabled;
-my @Callbacks;
-
 sub add_callback {
     my $class = shift;
     my ( $meth, $priority, $plugin, $code ) = @_;