Index: trunk/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 143)
+++ trunk/wp-content/plugins/xpressme/include/custom_functions.php	(revision 144)
@@ -30,17 +30,17 @@
 
 function xpress_is_theme_sidebar_disp(){
-	global $XPressME;
-	return $XPressME->is_theme_sidebar_disp;
+	global $xpress_config;
+	return $xpress_config->is_theme_sidebar_disp;
 }	
 
 function xpress_left_arrow_post_link($show = false)
 {
-	global $XPressME;
+	global $xpress_config;
 	$ret = '';
 		
-	if($XPressME->is_left_postnavi_old){
-		$link_title = $XPressME->old_post_link_text;
-		ob_start();
-		if ($XPressME->is_postnavi_title_disp)
+	if($xpress_config->is_left_postnavi_old){
+		$link_title = $xpress_config->old_post_link_text;
+		ob_start();
+		if ($xpress_config->is_postnavi_title_disp)
 			previous_post_link('« %link');
 		else 
@@ -49,7 +49,7 @@
 		ob_end_clean();
 	} else {
-		$link_title = $XPressME->newer_post_link_text;
-		ob_start();
-		if ($XPressME->is_postnavi_title_disp)
+		$link_title = $xpress_config->newer_post_link_text;
+		ob_start();
+		if ($xpress_config->is_postnavi_title_disp)
 			next_post_link('« %link');
 		else
@@ -59,8 +59,8 @@
 	}
 	
-	if ($XPressME->is_postnavi_title_disp){
+	if ($xpress_config->is_postnavi_title_disp){
 		$on_mouse_show = $link_title;
 	} else  {
-		if($XPressME->is_left_postnavi_old){
+		if($xpress_config->is_left_postnavi_old){
 			ob_start();
 				previous_post_link('%link');
@@ -87,11 +87,11 @@
 function xpress_right_arrow_post_link($show = false)
 {
-	global $XPressME;
+	global $xpress_config;
 	$ret = '';		
 	
-	if($XPressME->is_left_postnavi_old){
-		$link_title = $XPressME->newer_post_link_text;
-		ob_start();
-		if ($XPressME->is_postnavi_title_disp)
+	if($xpress_config->is_left_postnavi_old){
+		$link_title = $xpress_config->newer_post_link_text;
+		ob_start();
+		if ($xpress_config->is_postnavi_title_disp)
 			next_post_link('%link »');
 		else
@@ -100,7 +100,7 @@
 		ob_end_clean();
 	} else {
-		$link_title = $XPressME->old_post_link_text;
-		ob_start();
-		if ($XPressME->is_postnavi_title_disp)
+		$link_title = $xpress_config->old_post_link_text;
+		ob_start();
+		if ($xpress_config->is_postnavi_title_disp)
 			previous_post_link('%link »');
 		else 
@@ -110,8 +110,8 @@
 	}
 	
-	if ($XPressME->is_postnavi_title_disp){
+	if ($xpress_config->is_postnavi_title_disp){
 		$on_mouse_show = $link_title;
 	} else  {
-		if($XPressME->is_left_postnavi_old){
+		if($xpress_config->is_left_postnavi_old){
 			ob_start();
 				next_post_link('%link');
@@ -138,9 +138,9 @@
 function xpress_left_arrow_posts_link($show = false)
 {
-	global $XPressME;
+	global $xpress_config;
 	$ret = '';
 		
-	if($XPressME->is_left_page_navi_old){
-		$link_title = $XPressME->old_page_link_text;
+	if($xpress_config->is_left_page_navi_old){
+		$link_title = $xpress_config->old_page_link_text;
 		ob_start();
 		next_posts_link("« $link_title");
@@ -148,5 +148,5 @@
 		ob_end_clean();
 	} else {
-		$link_title = $XPressME->newer_page_link_text;
+		$link_title = $xpress_config->newer_page_link_text;
 		ob_start();
 		previous_posts_link("« $link_title");
@@ -163,9 +163,9 @@
 function xpress_right_arrow_posts_link($show = false)
 {
-	global $XPressME;
+	global $xpress_config;
 	$ret = '';		
 	
-	if($XPressME->is_left_page_navi_old){
-		$link_title = $XPressME->newer_page_link_text;
+	if($xpress_config->is_left_page_navi_old){
+		$link_title = $xpress_config->newer_page_link_text;
 		ob_start();
 		previous_posts_link("$link_title »");
@@ -173,5 +173,5 @@
 		ob_end_clean();
 	} else {
-		$link_title = $XPressME->old_page_link_text;
+		$link_title = $xpress_config->old_page_link_text;
 		ob_start();
 		next_posts_link("$link_title »");
@@ -188,6 +188,6 @@
 
 function xpress_is_author_view_count(){
-	global $XPressME;
-	return $XPressME->is_author_view_count;
+	global $xpress_config;
+	return $xpress_config->is_author_view_count;
 }