Index: trunk/wp-content/themes/xpress_default/blocks/recent_comments_block.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/recent_comments_block.php	(revision 41)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?php
-if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
-
-function recent_comments_block($options)
-{
-	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-	$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
-	$disp_length = empty( $options[2] ) ? '30' : $options[2] ;
-	$selected = array_slice($options,3); // get allowed cats
-	$this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_block_comments.html' : trim( $options[4] );
-	$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
-	
-	$myts =& MyTextSanitizer::getInstance();
-
-	$this_url = '/modules/'. $mydirname;
-	$call_url = $_SERVER['REQUEST_URI'];
-	
-	$disp_all = in_array('0',$selected);
-	$disp_comment = in_array('1',$selected);
-	$disp_trackback = in_array('2',$selected);
-	$disp_pingback = in_array('3',$selected);
-	
-	$type_select = '';
-	if (!$disp_all){			
-		if ($disp_comment){
-			$in_where =  "''";
-		}
-		if ($disp_trackback){
-			if (empty($in_where)) $in_where =  "'trackback' "; else $in_where .=  ",'trackback'";
-		}
-				
-		if ($disp_pingback){
-			if (empty($in_where)) $in_where =  "'pingback' "; else $in_where .=  ",'pingback'";
-		}
-		
-		if (! empty($in_where)){
-			$type_select = " AND comment_type IN($in_where) ";				
-		}
-	}
-	
-	global $wpdb;
-	$block = array();
-		
-	if (!is_null($wpdb)){
-		$comment_sql  = "SELECT comment_ID,comment_post_ID,comment_author,comment_author_email,comment_author_url,comment_content, comment_type,UNIX_TIMESTAMP(comment_date) as comment_unix_time ";
-		$comment_sql .= "FROM $wpdb->comments LEFT JOIN $wpdb->posts ON  $wpdb->posts.ID = $wpdb->comments.comment_post_ID ";
-		$comment_sql .= "WHERE comment_approved = '1' AND post_type = 'post'  AND post_status = 'publish' $type_select ";
-		$comment_sql .= "ORDER BY comment_date_gmt DESC LIMIT $disp_count";
-
-		$comments = $wpdb->get_results($comment_sql);
-		$format = get_settings('date_format') . ' ' . get_settings('time_format');				
-		
-		if ( $comments ) {
-			$output .= '<ul>';
-			$item_no = 0;
-			foreach ($comments as $comment){
-				$comment_content = $comment->comment_content;
-				$comment_excerpt = ($disp_length>0 ? xoops_substr($comment_content, 0, $disp_length): $comment->comment_content);
-
-				$comment_link = get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID ;
-				$comment_title = $comment_excerpt;
-				$comment_title_link = "<a href='$comment_link' rel='external nofollow' class='url'>$comment_title</a>";
-
-				$post_link = get_comment_link($comment->comment_ID);
-				$post_title = get_the_title($comment->comment_post_ID);
-				$post_title_link = '<a href="'. $post_link . '">' . $post_title . '</a>';
-				
-				$author_link = $comment->comment_author_url;
-				$author_name = $comment->comment_author;
-				$author_name_link = (( empty( $author_link ) || 'http://' == $author_link ) ? $author_name : "<a href='$author_link' rel='external nofollow' class='url'>$author_name</a>");
-
-				$comment_type = (empty($comment->comment_type) ? 'comment': $comment->comment_type);
-				$from_auther_to_post = sprintf(__('%1$s on %2$s'), $author_name_link , $post_title_link );
-
-				$row_data = array(
-					'comment_ID' 		=> $comment->comment_ID ,
-					'comment_post_ID'	=> $comment->comment_post_ID ,
-					'comment_date' 		=> date(get_settings('date_format'),$comment->comment_unix_time) ,
-					'comment_date_time' => date(get_settings('date_format') . ' ' . get_settings('time_format'),$comment->comment_unix_time) ,
-					'comment_content' 	=> $comment_content ,
-					'comment_excerpt' 	=> $comment_excerpt ,	
-					'comment_link' 		=> $comment_link,
-					'comment_title' 	=> $comment_title ,
-					'comment_title_link' => $comment_title_link ,
-					'post_link' 		=> $post_link,
-					'post_title' 		=> $post_title,
-					'post_title_link' 	=> $post_title_link,
-					'author_link' 		=> $author_link,
-					'author_name' 		=> $author_name,
-					'author_name_link' 	=> $author_name_link,		
-					'comment_type' 		=> $comment_type,																																		
-					'from_auther_to_post' => $from_auther_to_post
-				);
-				
-				$block['contents']['item'.$item_no] = $row_data;
-				$item_no++;
-			}
-		}
-	}
-	return $block ;
-}
-?>
Index: trunk/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php	(revision 44)
+++ trunk/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php	(revision 44)
@@ -0,0 +1,102 @@
+<?php
+if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+
+function recent_comments_block($options)
+{
+	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+	$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
+	$disp_length = empty( $options[2] ) ? '30' : $options[2] ;
+	$selected = array_slice($options,3); // get allowed cats
+	$this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_block_comments.html' : trim( $options[4] );
+	$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+	
+	$myts =& MyTextSanitizer::getInstance();
+
+	$this_url = '/modules/'. $mydirname;
+	$call_url = $_SERVER['REQUEST_URI'];
+	
+	$disp_all = in_array('0',$selected);
+	$disp_comment = in_array('1',$selected);
+	$disp_trackback = in_array('2',$selected);
+	$disp_pingback = in_array('3',$selected);
+	
+	$type_select = '';
+	if (!$disp_all){			
+		if ($disp_comment){
+			$in_where =  "''";
+		}
+		if ($disp_trackback){
+			if (empty($in_where)) $in_where =  "'trackback' "; else $in_where .=  ",'trackback'";
+		}
+				
+		if ($disp_pingback){
+			if (empty($in_where)) $in_where =  "'pingback' "; else $in_where .=  ",'pingback'";
+		}
+		
+		if (! empty($in_where)){
+			$type_select = " AND comment_type IN($in_where) ";				
+		}
+	}
+	
+	global $wpdb;
+	$block = array();
+		
+	if (!is_null($wpdb)){
+		$comment_sql  = "SELECT comment_ID,comment_post_ID,comment_author,comment_author_email,comment_author_url,comment_content, comment_type,UNIX_TIMESTAMP(comment_date) as comment_unix_time ";
+		$comment_sql .= "FROM $wpdb->comments LEFT JOIN $wpdb->posts ON  $wpdb->posts.ID = $wpdb->comments.comment_post_ID ";
+		$comment_sql .= "WHERE comment_approved = '1' AND post_type = 'post'  AND post_status = 'publish' $type_select ";
+		$comment_sql .= "ORDER BY comment_date_gmt DESC LIMIT $disp_count";
+
+		$comments = $wpdb->get_results($comment_sql);
+		$format = get_settings('date_format') . ' ' . get_settings('time_format');				
+		
+		if ( $comments ) {
+			$output .= '<ul>';
+			$item_no = 0;
+			foreach ($comments as $comment){
+				$comment_content = $comment->comment_content;
+				$comment_excerpt = ($disp_length>0 ? xpress_substr($comment_content, 0, $disp_length): $comment->comment_content);
+
+				$comment_link = get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID ;
+				$comment_title = $comment_excerpt;
+				$comment_title_link = "<a href='$comment_link' rel='external nofollow' class='url'>$comment_title</a>";
+
+				$post_link = get_comment_link($comment->comment_ID);
+				$post_title = get_the_title($comment->comment_post_ID);
+				$post_title_link = '<a href="'. $post_link . '">' . $post_title . '</a>';
+				
+				$author_link = $comment->comment_author_url;
+				$author_name = $comment->comment_author;
+				$author_name_link = (( empty( $author_link ) || 'http://' == $author_link ) ? $author_name : "<a href='$author_link' rel='external nofollow' class='url'>$author_name</a>");
+
+				$comment_type = (empty($comment->comment_type) ? 'comment': $comment->comment_type);
+				$from_auther_to_post = sprintf(__('%1$s on %2$s'), $author_name_link , $post_title_link );
+
+				$row_data = array(
+					'comment_ID' 		=> $comment->comment_ID ,
+					'comment_post_ID'	=> $comment->comment_post_ID ,
+					'comment_date' 		=> date(get_settings('date_format'),$comment->comment_unix_time) ,
+					'comment_date_time' => date(get_settings('date_format') . ' ' . get_settings('time_format'),$comment->comment_unix_time) ,
+					'comment_content' 	=> $comment_content ,
+					'comment_excerpt' 	=> $comment_excerpt ,	
+					'comment_link' 		=> $comment_link,
+					'comment_title' 	=> $comment_title ,
+					'comment_title_link' => $comment_title_link ,
+					'post_link' 		=> $post_link,
+					'post_title' 		=> $post_title,
+					'post_title_link' 	=> $post_title_link,
+					'author_link' 		=> $author_link,
+					'author_name' 		=> $author_name,
+					'author_name_link' 	=> $author_name_link,		
+					'comment_type' 		=> $comment_type,																																		
+					'from_auther_to_post' => $from_auther_to_post
+				);
+				
+				$block['contents']['item'.$item_no] = $row_data;
+				$item_no++;
+			}
+		}
+	}
+	return $block ;
+}
+?>