Index: trunk/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme.php	(revision 104)
+++ trunk/wp-content/plugins/xpressme/xpressme.php	(revision 144)
@@ -17,12 +17,12 @@
 $xoops_db->tables = array('modules', 'newblocks', 'users');
 
-$XPressME = new XPressME_Class();
+$xpress_config = new XPressME_Class();
 
 require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
 
-add_action('admin_menu', array(&$XPressME, 'add_option_page'));
-add_action('admin_head', array(&$XPressME, 'add_admin_head'));
-add_filter("upload_dir",array(&$XPressME, 'xpress_upload_filter'),	1);		// Change wp-include/wp_upload_dir()
-if (!$XPressME->is_save_post_revision){
+add_action('admin_menu', array(&$xpress_config, 'add_option_page'));
+add_action('admin_head', array(&$xpress_config, 'add_admin_head'));
+add_filter("upload_dir",array(&$xpress_config, 'xpress_upload_filter'),	1);		// Change wp-include/wp_upload_dir()
+if (!$xpress_config->is_save_post_revision){
 	remove_action( 'pre_post_update', 'wp_save_post_revision' );			// Not Save Post Revision
 }
@@ -55,5 +55,5 @@
 
 //D3Forum Comment Integration
-if ($XPressME->is_use_d3forum){
+if ($xpress_config->is_use_d3forum){
 	require_once dirname( __FILE__ ).'/include/d3forum_comment_synchro.php' ;
 	add_action("comment_post",	"onaction_comment_post");
@@ -70,6 +70,6 @@
 
 // SQL debug windows
-add_filter('query', array(&$XPressME, 'xpress_sql_debug'));
-add_action('admin_footer', array(&$XPressME, 'displayDebugLog'));
-add_action('get_footer', array(&$XPressME, 'displayDebugLog'));
+add_filter('query', array(&$xpress_config, 'xpress_sql_debug'));
+add_action('admin_footer', array(&$xpress_config, 'displayDebugLog'));
+add_action('get_footer', array(&$xpress_config, 'displayDebugLog'));
 ?>