revert gLibertySystem object creation back to Class file for now

2 files changed, 5 insertions, 6 deletions

diff --git a/LibertySystem.php b/LibertySystem.php
index 77e66e0..2e87d73 100755
--- a/LibertySystem.php
+++ b/LibertySystem.php
@@ -3,7 +3,7 @@
 * System class for handling the liberty package
 *
 * @package  liberty
-* @version  $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.43 2006/09/08 16:38:20 spiderr Exp $
+* @version  $Header: /cvsroot/bitweaver/_bit_liberty/LibertySystem.php,v 1.44 2006/09/08 19:07:33 squareing Exp $
 * @author   spider <spider@steelsun.com>
 */
 
@@ -580,4 +580,6 @@ function parse_data_plugins( &$data, &$preparsed, &$noparsed, &$pParser, &$pComm
 	}
 }
 
+global $gLibertySystem;
+$gLibertySystem = new LibertySystem();
 ?>
diff --git a/bit_setup_inc.php b/bit_setup_inc.php
index 44f6708..1e36384 100644
--- a/bit_setup_inc.php
+++ b/bit_setup_inc.php
@@ -3,7 +3,7 @@
  * base package include
  *
  * @author   spider <spider@steelsun.com>
- * @version  $Revision: 1.9 $
+ * @version  $Revision: 1.10 $
  * @package  liberty
  * @subpackage functions
  */
@@ -11,15 +11,12 @@
 $registerHash = array(
 	'package_name' => 'liberty',
 	'package_path' => dirname( __FILE__ ).'/',
-    'required_package'=> TRUE,
+	'required_package'=> TRUE,
 );
 $gBitSystem->registerPackage( $registerHash );
 
 require_once( LIBERTY_PKG_PATH.'LibertySystem.php' );
 
-global $gLibertySystem;
-$gLibertySystem = new LibertySystem();
-
 // load only the active plugins unless this is the first run after an install
 $current_default_format_guid = $gBitSystem->getConfig( 'default_format' );
 $plugin_status = $gBitSystem->getConfig( 'liberty_plugin_status_'.$current_default_format_guid );