Index: /trunk/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- /trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 74)
+++ /trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 75)
@@ -28,17 +28,17 @@
 
 function xpress_is_theme_sidebar_disp(){
-	$config = new XPressME_Class();
-	return $config->is_theme_sidebar_disp;
+	global $XPressME;
+	return $XPressME->is_theme_sidebar_disp;
 }	
 
 function xpress_left_arrow_post_link($show = false)
 {
-	$config = new XPressME_Class();
+	global $XPressME;
 	$ret = '';
 		
-	if($config->is_left_postnavi_old){
-		$link_title = $config->old_post_link_text;
+	if($XPressME->is_left_postnavi_old){
+		$link_title = $XPressME->old_post_link_text;
 		ob_start();
-		if ($config->is_postnavi_title_disp)
+		if ($XPressME->is_postnavi_title_disp)
 			previous_post_link('&laquo; %link');
 		else 
@@ -47,7 +47,7 @@
 		ob_end_clean();
 	} else {
-		$link_title = $config->newer_post_link_text;
+		$link_title = $XPressME->newer_post_link_text;
 		ob_start();
-		if ($config->is_postnavi_title_disp)
+		if ($XPressME->is_postnavi_title_disp)
 			next_post_link('&laquo; %link');
 		else
@@ -57,8 +57,8 @@
 	}
 	
-	if ($config->is_postnavi_title_disp){
+	if ($XPressME->is_postnavi_title_disp){
 		$on_mouse_show = $link_title;
 	} else  {
-		if($config->is_left_postnavi_old){
+		if($XPressME->is_left_postnavi_old){
 			ob_start();
 				previous_post_link('%link');
@@ -85,11 +85,11 @@
 function xpress_right_arrow_post_link($show = false)
 {
-	$config = new XPressME_Class();
+	global $XPressME;
 	$ret = '';		
 	
-	if($config->is_left_postnavi_old){
-		$link_title = $config->newer_post_link_text;
+	if($XPressME->is_left_postnavi_old){
+		$link_title = $XPressME->newer_post_link_text;
 		ob_start();
-		if ($config->is_postnavi_title_disp)
+		if ($XPressME->is_postnavi_title_disp)
 			next_post_link('%link &raquo;');
 		else
@@ -98,7 +98,7 @@
 		ob_end_clean();
 	} else {
-		$link_title = $config->old_post_link_text;
+		$link_title = $XPressME->old_post_link_text;
 		ob_start();
-		if ($config->is_postnavi_title_disp)
+		if ($XPressME->is_postnavi_title_disp)
 			previous_post_link('%link &raquo;');
 		else 
@@ -108,8 +108,8 @@
 	}
 	
-	if ($config->is_postnavi_title_disp){
+	if ($XPressME->is_postnavi_title_disp){
 		$on_mouse_show = $link_title;
 	} else  {
-		if($config->is_left_postnavi_old){
+		if($XPressME->is_left_postnavi_old){
 			ob_start();
 				next_post_link('%link');
@@ -135,6 +135,6 @@
 
 function xpress_is_author_view_count(){
-	$config = new XPressME_Class();
-	return $config->is_author_view_count;
+	global $XPressME;
+	return $XPressME->is_author_view_count;
 }
 
Index: /trunk/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- /trunk/wp-content/plugins/xpressme/xpressme.php	(revision 74)
+++ /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
 }
