Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 273)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php	(revision 274)
@@ -519,14 +519,32 @@
 }
 
-function xpress_the_content($more_link_text = null, $stripteaser = 0, $more_file = '',$show = true)
+function xpress_the_content($args ='')
 {
 	global $post,$xpress_config;
 	
-	
-	if ($xpress_config->is_content_excerpt){
-		$excerpt_length_word = $xpress_config->excerpt_length_word;
-		$excerpt_length_character = $xpress_config->excerpt_length_character;
-		$more_link_text = $xpress_config->more_link_text;
-		$content = get_xpress_excerpt_contents($excerpt_length_word,$excerpt_length_character,$more_link_text);
+	$defaults = array(
+		'more_link_text'=> null,
+		'stripteaser' => 0,
+		'more_file' => '',
+		'configration_select' => 1,
+		'do_excerpt' => 0,
+		'excerpt_length_word' => $xpress_config->excerpt_length_word ,
+		'excerpt_length_character' => $xpress_config->excerpt_length_character ,
+		'excerpt_more_link_text' => $xpress_config->more_link_text ,
+		'echo' => 1
+	);
+	$r = wp_parse_args( $args, $defaults );
+
+	extract( $r );
+	
+	if ($configration_select){
+		if ($xpress_config->is_content_excerpt)
+			$do_excerpt = 1;
+		else
+			$do_excerpt = 0;
+	}
+	
+	if ($do_excerpt){
+		$content = get_xpress_excerpt_contents($excerpt_length_word,$excerpt_length_character,$excerpt_more_link_text);
 	} else {
 		$content = get_the_content($more_link_text,$stripteaser,$more_file);
@@ -534,6 +552,8 @@
 		$content = str_replace(']]>', ']]>', $content);
 	}	
-	if(empty($show)) return $content;
-	echo $content;
+	if ($echo)
+		echo $content;
+	else
+		return $content;
 }