Index: trunk/xpressme_integration_kit/include/xpress_block_header.php
===================================================================
--- trunk/xpressme_integration_kit/include/xpress_block_header.php	(revision 672)
+++ trunk/xpressme_integration_kit/include/xpress_block_header.php	(revision 683)
@@ -69,4 +69,23 @@
 			$header_str = ob_get_contents();
 		ob_end_clean();
+		
+		if(function_exists('_admin_bar_bump_cb')){
+			//remove admin_bar_bump_cb
+			ob_start();
+				_admin_bar_bump_cb();
+				$admin_bar_bump_cb_str = ob_get_contents();
+			ob_end_clean();
+			$header_str = str_replace_ex($admin_bar_bump_cb_str,'',$header_str);
+		}
+		
+		if(function_exists('wp_admin_bar_header')){		
+			//remove wp_adminbar_header
+			ob_start();
+				wp_admin_bar_header();
+				$wp_admin_bar_header_str = ob_get_contents();
+			ob_end_clean();
+			$header_str = str_replace_ex($wp_admin_bar_header_str,'',$header_str);
+		}
+		
 		$pattern = '<\s*link\s+rel\s*=[^>]*?>';
 		$header_str = preg_replace("/".$pattern."/s" , '' , $header_str);
@@ -79,5 +98,8 @@
 		$pattern = "^";
 		$header_str = preg_replace("/".$pattern."/m" , "\t" , $header_str);
-		ob_start();	
+		
+		ob_start();
+			global $show_admin_bar;
+			$show_admin_bar = false;	//remove adminbar
 			wp_footer();
 			$footer_str = ob_get_contents();
@@ -99,4 +121,24 @@
 		xpress_block_header_cash_write($mydirname,$data);
 	}
+	
+	function str_replace_ex($regx,$replace,$str){
+		
+		if (empty($regx)) return $str;
+		$pattern = preg_quote($regx,'/');
+		if (preg_match('/\r/',$pattern)){
+				$pattern=preg_replace('/\r/','\\r',$pattern);
+		}		
+		if (preg_match('/\n/',$pattern)){
+				$pattern=preg_replace('/\n/','\\n',$pattern);
+		}
+		if (preg_match('/\t/',$pattern)){
+				$pattern=preg_replace('/\t/','\\t',$pattern);
+		}
+		$pattern = '/'. $pattern . '/';
+		if (preg_match($pattern,$str)){
+			$str=preg_replace($pattern,$replace,$str);
+		}
+		return $str;
+	}
 
 }