### Eclipse Workspace Patch 1.0
#P buddypress
Index: bp-groups/bp-groups-classes.php
===================================================================
--- bp-groups/bp-groups-classes.php	(revision 1899)
+++ bp-groups/bp-groups-classes.php	(working copy)
@@ -992,7 +992,7 @@
 				add_action( 'wp', array( &$this, 'edit_screen_save' ) );
 				add_action( 'groups_custom_edit_steps', array( &$this, 'edit_screen' ) );
 
-				if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) ) {
+				if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' ) {
 					bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );		
 				} else {
 					add_action( 'bp_template_content_header', create_function( '', 'echo "<ul class=\"content-header-nav\">"; bp_group_admin_tabs(); echo "</ul>";' ) );
Index: bp-blogs/deprecated/bp-blogs-deprecated.php
===================================================================
--- bp-blogs/deprecated/bp-blogs-deprecated.php	(revision 1899)
+++ bp-blogs/deprecated/bp-blogs-deprecated.php	(working copy)
@@ -96,7 +96,7 @@
 		
 	check_ajax_referer('directory_blogs');
 	
-	load_template( TEMPLATEPATH . '/directories/blogs/blogs-loop.php' );
+	locate_template( array( 'directories/blogs/blogs-loop.php' ), true );
 }
 add_action( 'wp_ajax_directory_blogs', 'bp_blogs_ajax_directory_blogs' );
 
Index: bp-core/bp-core-signup.php
===================================================================
--- bp-core/bp-core-signup.php	(revision 1899)
+++ bp-core/bp-core-signup.php	(working copy)
@@ -210,7 +210,7 @@
 	if ( false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php') )
 		return false;
 		
-	if ( file_exists( TEMPLATEPATH . '/registration/register.php' ) || file_exists( TEMPLATEPATH . '/register.php' ) )
+	if ( locate_template( array( 'registration/register.php' ), false ) != '' || locate_template( array( 'register.php' ), false ) != '' )
 		die;
 }
 add_action( 'signup_header', 'bp_core_wpsignup_redirect' );
Index: bp-blogs/admin-tabs/bp-blogs-comments-tab.php
===================================================================
--- bp-blogs/admin-tabs/bp-blogs-comments-tab.php	(revision 1899)
+++ bp-blogs/admin-tabs/bp-blogs-comments-tab.php	(working copy)
@@ -1,3 +1,3 @@
 <div class="wrap">
-<?php require( TEMPLATEPATH . "/blogs/recent-comments.php" ); ?>
+<?php locate_template( array( 'blogs/recent-comments.php' ), true ); ?>
 </div>
\ No newline at end of file
Index: bp-groups/deprecated/bp-groups-deprecated.php
===================================================================
--- bp-groups/deprecated/bp-groups-deprecated.php	(revision 1899)
+++ bp-groups/deprecated/bp-groups-deprecated.php	(working copy)
@@ -671,7 +671,7 @@
 		
 	check_ajax_referer( 'group-filter-box' );
 	
-	load_template( TEMPLATEPATH . '/groups/group-loop.php' );
+	locate_template( array( 'groups/group-loop.php' ), true );
 }
 add_action( 'wp_ajax_group_filter', 'groups_ajax_group_filter' );
 
@@ -779,7 +779,7 @@
 		
 	check_ajax_referer('directory_groups');
 
-	load_template( TEMPLATEPATH . '/directories/groups/groups-loop.php' );
+	locate_template( array( 'directories/groups/groups-loop.php' ), true );
 }
 add_action( 'wp_ajax_directory_groups', 'bp_core_ajax_directory_groups' );
 
Index: bp-xprofile/bp-xprofile-templatetags.php
===================================================================
--- bp-xprofile/bp-xprofile-templatetags.php	(revision 1899)
+++ bp-xprofile/bp-xprofile-templatetags.php	(working copy)
@@ -162,7 +162,7 @@
 }
 
 function xprofile_get_profile() {
-	load_template( TEMPLATEPATH . '/profile/profile-loop.php');
+	locate_template( array( 'profile/profile-loop.php'), true );
 }
 
 function bp_has_profile( $args = '' ) { 
Index: bp-core/bp-core-templatetags.php
===================================================================
--- bp-core/bp-core-templatetags.php	(revision 1899)
+++ bp-core/bp-core-templatetags.php	(working copy)
@@ -452,8 +452,7 @@
 }
 
 function bp_get_plugin_sidebar() {
-	if ( file_exists(TEMPLATEPATH . '/plugin-sidebar.php' ) )
-		locate_template( array( '/plugin-sidebar.php' ), true );
+	locate_template( array( 'plugin-sidebar.php' ), true );
 }
 
 function bp_is_blog_page() {
@@ -683,7 +682,7 @@
 	if ( $hide_on_directory && $bp->is_directory )
 		return false;
 	
-	include_once( TEMPLATEPATH . '/userbar.php' );
+	locate_template( array( 'userbar.php' ), true );
 }
 
 function bp_get_optionsbar( $hide_on_directory = true ) {
@@ -691,8 +690,8 @@
 	
 	if ( $hide_on_directory && $bp->is_directory )
 		return false;
-	
-	include_once( TEMPLATEPATH . '/optionsbar.php' );
+		
+	locate_template( array( 'optionsbar.php' ), true );
 }
 
 function bp_is_directory() {
Index: bp-groups.php
===================================================================
--- bp-groups.php	(revision 1899)
+++ bp-groups.php	(working copy)
@@ -374,7 +374,7 @@
 
 	do_action( 'groups_screen_group_invites', $group_id );
 	
-	if ( file_exists( TEMPLATEPATH . '/groups/invites.php' ) )
+	if ( locate_template( array( 'groups/invites.php' ), false ) != '' )
 		bp_core_load_template( apply_filters( 'groups_template_group_invites', 'groups/invites' ) );
 	else
 		bp_core_load_template( apply_filters( 'groups_template_group_invites', 'groups/list-invites' ) );		
@@ -564,7 +564,7 @@
 
 		do_action( 'groups_screen_group_home' );	
 		
-		if ( file_exists( TEMPLATEPATH . '/groups/single/home.php' ) )
+		if ( locate_template( array( 'groups/single/home.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
@@ -730,7 +730,7 @@
 
 			/* Standard topic display */
 			else {
-				if ( file_exists( TEMPLATEPATH . '/groups/single/forum/topic.php' ) )
+				if ( locate_template( array( 'groups/single/forum/topic.php' ), false ) != '' )
 					bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/single/forum/topic' ) );
 				else
 					bp_core_load_template( apply_filters( 'groups_template_group_forum_topic', 'groups/forum/topic' ) );
@@ -756,7 +756,7 @@
 			
 			do_action( 'groups_screen_group_forum', $topic_id, $forum_id );
 			
-			if ( file_exists( TEMPLATEPATH . '/groups/single/forum/index.php' ) )
+			if ( locate_template( array( 'groups/single/forum/index.php' ), false ) != '' )
 				bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/forum/index' ) );
 			else
 				bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/forum/index' ) );				
@@ -803,12 +803,12 @@
 				bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/' . $bp->wire->slug );
 		
 		} else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) {
-			if ( file_exists( TEMPLATEPATH . '/groups/single/wire.php' ) )
+			if ( locate_template( array( 'groups/single/wire.php' ), false ) != '' )
 				bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/single/wire' ) );
 			else	
 				bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/wire' ) );
 		} else {
-			if ( file_exists( TEMPLATEPATH . '/groups/single/home.php' ) )
+			if ( locate_template( array( 'groups/single/home.php' ), false ) != '' )
 				bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
 			else	
 				bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
@@ -822,7 +822,7 @@
 	if ( $bp->is_single_item ) {
 		do_action( 'groups_screen_group_members', $bp->groups->current_group->id );
 
-		if ( file_exists( TEMPLATEPATH . '/groups/single/members.php' ) )
+		if ( locate_template( array( 'groups/single/members.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/members' ) );
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/list-members' ) );		
@@ -848,7 +848,7 @@
 			bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
 		} else {
 			// Show send invite page
-			if ( file_exists( TEMPLATEPATH . '/groups/single/send-invite.php' ) )
+			if ( locate_template( array( 'groups/single/send-invite.php' ), false ) != '' )
 				bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/single/send-invite' ) );	
 			else
 				bp_core_load_template( apply_filters( 'groups_template_group_invite', 'groups/send-invite' ) );	
@@ -886,7 +886,7 @@
 			do_action( 'groups_screen_group_leave', $bp->groups->current_group->id );
 			
 			// Show leave group page
-			if ( file_exists( TEMPLATEPATH . '/groups/single/leave-confirm.php' ) )
+			if ( locate_template( array( 'groups/single/leave-confirm.php' ), false ) != '' )
 				bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/single/leave-confirm' ) );
 			else
 				bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/leave-group-confirm' ) );				
@@ -917,7 +917,7 @@
 		
 		do_action( 'groups_screen_group_request_membership', $bp->groups->current_group->id );
 		
-		if ( file_exists( TEMPLATEPATH . '/groups/single/request-membership.php' ) )
+		if ( locate_template( array( 'groups/single/request-membership.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/single/request-membership' ) );
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_request_membership', 'groups/request-membership' ) );			
@@ -962,7 +962,7 @@
 
 			do_action( 'groups_screen_group_admin_edit_details', $bp->groups->current_group->id );
 
-			if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) )
+			if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' )
 				bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/single/admin' ) );		
 			else
 				bp_core_load_template( apply_filters( 'groups_template_group_admin', 'groups/admin/edit-details' ) );			
@@ -1006,7 +1006,7 @@
 
 		do_action( 'groups_screen_group_admin_settings', $bp->groups->current_group->id );
 		
-		if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) )
+		if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/single/admin' ) );		
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_settings', 'groups/admin/group-settings' ) );
@@ -1067,7 +1067,7 @@
 
 		do_action( 'groups_screen_group_admin_avatar', $bp->groups->current_group->id );	
 		
-		if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) )
+		if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/single/admin' ) );		
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_avatar', 'groups/admin/group-avatar' ) );		
@@ -1162,7 +1162,7 @@
 
 		do_action( 'groups_screen_group_admin_manage_members', $bp->groups->current_group->id );
 		
-		if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) )
+		if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/single/admin' ) );		
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_manage_members', 'groups/admin/manage-members' ) );
@@ -1219,7 +1219,7 @@
 
 		do_action( 'groups_screen_group_admin_requests', $bp->groups->current_group->id );
 
-		if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) )
+		if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/single/admin' ) );		
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_requests', 'groups/admin/membership-requests' ) );		
@@ -1256,7 +1256,7 @@
 
 		do_action( 'groups_screen_group_admin_delete_group', $bp->groups->current_group->id );
 
-		if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) )
+		if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' )
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/single/admin' ) );		
 		else
 			bp_core_load_template( apply_filters( 'groups_template_group_admin_delete_group', 'groups/admin/delete-group' ) );		
@@ -1337,7 +1337,7 @@
 		bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
 	}
 
-	if ( file_exists( TEMPLATEPATH . '/groups/single/admin.php' ) )
+	if ( locate_template( array( 'groups/single/admin.php' ), false ) != '' )
 		bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );		
 	else
 		bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/group-home' ) );
Index: bp-status/bp-status-templatetags.php
===================================================================
--- bp-status/bp-status-templatetags.php	(revision 1899)
+++ bp-status/bp-status-templatetags.php	(working copy)
@@ -6,7 +6,7 @@
 	 * to "new".
 	 */
 	if ( 'new' == $_GET['status'] && is_user_logged_in() ) {
-		load_template( TEMPLATEPATH . '/status/post-form.php' );
+		locate_template( array( 'status/post-form.php' ), true );
 	} else {
 		if ( 'clear' == $_GET['status'] && is_user_logged_in() )
 			bp_status_clear_status();
Index: bp-blogs/admin-tabs/bp-blogs-tab.php
===================================================================
--- bp-blogs/admin-tabs/bp-blogs-tab.php	(revision 1899)
+++ bp-blogs/admin-tabs/bp-blogs-tab.php	(working copy)
@@ -1,3 +1,3 @@
 <div class="wrap">
-<?php require( TEMPLATEPATH . "/blogs/my-blogs.php" ); ?>
+<?php locate_template( array( 'blogs/my-blogs.php' ), true ); ?>
 </div>
\ No newline at end of file
Index: bp-core/deprecated/bp-core-deprecated.php
===================================================================
--- bp-core/deprecated/bp-core-deprecated.php	(revision 1899)
+++ bp-core/deprecated/bp-core-deprecated.php	(working copy)
@@ -893,7 +893,7 @@
 		
 	check_ajax_referer('directory_members');
 	
-	load_template( TEMPLATEPATH . '/directories/members/members-loop.php' );
+	locate_template( array( 'directories/members/members-loop.php' ), true );
 }
 add_action( 'wp_ajax_directory_members', 'bp_core_ajax_directory_members' );
 
Index: bp-blogs/admin-tabs/bp-blogs-posts-tab.php
===================================================================
--- bp-blogs/admin-tabs/bp-blogs-posts-tab.php	(revision 1899)
+++ bp-blogs/admin-tabs/bp-blogs-posts-tab.php	(working copy)
@@ -1,3 +1,3 @@
 <div class="wrap">
-<?php require( TEMPLATEPATH . "/blogs/recent-posts.php" ); ?>
+<?php locate_template( array( 'blogs/recent-posts.php' ), true ); ?>
 </div>
\ No newline at end of file