Index: trunk/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/wp-content/plugins/xpressme/xpressme.php	(revision 72)
+++ trunk/wp-content/plugins/xpressme/xpressme.php	(revision 75)
@@ -9,10 +9,6 @@
 */
 require_once('xpressme_class.php');
-require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
+
 require_once dirname( __FILE__ ).'/include/custom_functions.php' ;
-
-
-$xpessme = new XPressME_Class();
-
 
 $xoops_db = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
@@ -20,9 +16,12 @@
 $xoops_db->tables = array('modules', 'newblocks', 'users');
 
-
-add_action('admin_menu', array(&$xpessme, 'add_option_page'));
-add_action('admin_head', array(&$xpessme, 'add_admin_head'));
-add_filter("upload_dir",array(&$xpessme, 'xpress_upload_filter'),	1);		// Change wp-include/wp_upload_dir()
-if (!$xpressme->is_save_post_revision){
+$XPressME = new XPressME_Class();
+if (!is_admin_page_call()){
+	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){
 	remove_action( 'pre_post_update', 'wp_save_post_revision' );			// Not Save Post Revision
 }