### Eclipse Workspace Patch 1.0
#P buddypress
Index: bp-themes/bp-default/forums/single/topic.php
===================================================================
--- bp-themes/bp-default/forums/single/topic.php	(revision 4478)
+++ bp-themes/bp-default/forums/single/topic.php	(working copy)
@@ -191,5 +191,4 @@
 
 <?php do_action( 'bp_after_group_forum_topic' ) ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/single/settings/delete-account.php
===================================================================
--- bp-themes/bp-default/members/single/settings/delete-account.php	(revision 4478)
+++ bp-themes/bp-default/members/single/settings/delete-account.php	(working copy)
@@ -77,6 +77,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ) ?>
-
 <?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
Index: bp-themes/bp-default/blogs/index.php
===================================================================
--- bp-themes/bp-default/blogs/index.php	(revision 4478)
+++ bp-themes/bp-default/blogs/index.php	(working copy)
@@ -78,5 +78,4 @@
 
 	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/page.php
===================================================================
--- bp-themes/bp-default/page.php	(revision 4478)
+++ bp-themes/bp-default/page.php	(working copy)
@@ -35,6 +35,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
-
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/single/home.php
===================================================================
--- bp-themes/bp-default/members/single/home.php	(revision 4478)
+++ bp-themes/bp-default/members/single/home.php	(working copy)
@@ -74,5 +74,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/footer.php
===================================================================
--- bp-themes/bp-default/footer.php	(revision 4478)
+++ bp-themes/bp-default/footer.php	(working copy)
@@ -1,3 +1,4 @@
+			<?php get_sidebar( 'buddypress' ) ?>
 		</div> <!-- #container -->
 
 		<?php do_action( 'bp_after_container' ) ?>
Index: bp-themes/bp-default/footer-onecolumn-page.php
===================================================================
--- bp-themes/bp-default/footer-onecolumn-page.php	(revision 0)
+++ bp-themes/bp-default/footer-onecolumn-page.php	(revision 0)
@@ -0,0 +1,27 @@
+		</div> <!-- #container -->
+
+		<?php do_action( 'bp_after_container' ) ?>
+		<?php do_action( 'bp_before_footer' ) ?>
+
+		<div id="footer">
+			<?php if ( is_active_sidebar( 'first-footer-widget-area' ) || is_active_sidebar( 'second-footer-widget-area' ) || is_active_sidebar( 'third-footer-widget-area' ) || is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?>
+				<div id="footer-widgets">
+					<?php get_sidebar( 'footer' ) ?>
+				</div>
+			<?php endif; ?>
+
+			<div id="site-generator" role="contentinfo">
+				<?php do_action( 'bp_dtheme_credits' ) ?>
+				<p><?php printf( __( 'Proudly powered by <a href="%1$s">WordPress</a> and <a href="%2$s">BuddyPress</a>.', 'buddypress' ), 'http://wordpress.org', 'http://buddypress.org' ) ?></p>
+			</div>
+
+			<?php do_action( 'bp_footer' ) ?>
+		</div><!-- #footer -->
+
+		<?php do_action( 'bp_after_footer' ) ?>
+
+		<?php wp_footer(); ?>
+
+	</body>
+
+</html>
\ No newline at end of file
Index: bp-themes/bp-default/single.php
===================================================================
--- bp-themes/bp-default/single.php	(revision 4478)
+++ bp-themes/bp-default/single.php	(working copy)
@@ -53,6 +53,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
-
 <?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/archive.php
===================================================================
--- bp-themes/bp-default/archive.php	(revision 4478)
+++ bp-themes/bp-default/archive.php	(working copy)
@@ -69,6 +69,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
-
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file
Index: bp-themes/bp-default/forums/index.php
===================================================================
--- bp-themes/bp-default/forums/index.php	(revision 4478)
+++ bp-themes/bp-default/forums/index.php	(working copy)
@@ -153,5 +153,4 @@
 
 	<?php do_action( 'bp_after_directory_forums_content' ); ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/groups/single/plugins.php
===================================================================
--- bp-themes/bp-default/groups/single/plugins.php	(revision 4478)
+++ bp-themes/bp-default/groups/single/plugins.php	(working copy)
@@ -36,6 +36,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar( 'buddypress' ) ?>
-
 <?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
Index: bp-themes/bp-default/forums/single/forum.php
===================================================================
--- bp-themes/bp-default/forums/single/forum.php	(revision 4478)
+++ bp-themes/bp-default/forums/single/forum.php	(working copy)
@@ -60,6 +60,5 @@
 		</div><!-- .padder -->
 
 	<?php do_action( 'bp_after_directory_forums_content' ); ?>
-
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+	
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/index.php
===================================================================
--- bp-themes/bp-default/members/index.php	(revision 4478)
+++ bp-themes/bp-default/members/index.php	(working copy)
@@ -83,5 +83,4 @@
 
 	<?php do_action( 'bp_after_directory_members_content' ); ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/single/plugins.php
===================================================================
--- bp-themes/bp-default/members/single/plugins.php	(revision 4478)
+++ bp-themes/bp-default/members/single/plugins.php	(working copy)
@@ -65,5 +65,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/search.php
===================================================================
--- bp-themes/bp-default/search.php	(revision 4478)
+++ bp-themes/bp-default/search.php	(working copy)
@@ -66,6 +66,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
-
-<?php get_footer() ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/groups/create.php
===================================================================
--- bp-themes/bp-default/groups/create.php	(revision 4478)
+++ bp-themes/bp-default/groups/create.php	(working copy)
@@ -289,5 +289,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/activity/index.php
===================================================================
--- bp-themes/bp-default/activity/index.php	(revision 4478)
+++ bp-themes/bp-default/activity/index.php	(working copy)
@@ -143,6 +143,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ) ?>
-
-<?php get_footer( 'buddypress' ) ?>
+<?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/single/settings/general.php
===================================================================
--- bp-themes/bp-default/members/single/settings/general.php	(revision 4478)
+++ bp-themes/bp-default/members/single/settings/general.php	(working copy)
@@ -84,6 +84,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ) ?>
-
 <?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
Index: bp-themes/bp-default/registration/activate.php
===================================================================
--- bp-themes/bp-default/registration/activate.php	(revision 4478)
+++ bp-themes/bp-default/registration/activate.php	(working copy)
@@ -49,6 +49,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar( 'buddypress' ) ?>
-
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/members/single/settings/notifications.php
===================================================================
--- bp-themes/bp-default/members/single/settings/notifications.php	(revision 4478)
+++ bp-themes/bp-default/members/single/settings/notifications.php	(working copy)
@@ -77,6 +77,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ) ?>
-
 <?php get_footer( 'buddypress' ) ?>
\ No newline at end of file
Index: bp-themes/bp-default/onecolumn-page.php
===================================================================
--- bp-themes/bp-default/onecolumn-page.php	(revision 4478)
+++ bp-themes/bp-default/onecolumn-page.php	(working copy)
@@ -46,4 +46,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer('onecolumn-page'); ?>
\ No newline at end of file
Index: bp-themes/bp-default/404.php
===================================================================
--- bp-themes/bp-default/404.php	(revision 4478)
+++ bp-themes/bp-default/404.php	(working copy)
@@ -24,6 +24,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
-
 <?php get_footer(); ?>
\ No newline at end of file
Index: bp-themes/bp-default/index.php
===================================================================
--- bp-themes/bp-default/index.php	(revision 4478)
+++ bp-themes/bp-default/index.php	(working copy)
@@ -63,6 +63,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar() ?>
-
-<?php get_footer() ?>
+<?php get_footer() ?>
\ No newline at end of file
Index: bp-themes/bp-default/registration/register.php
===================================================================
--- bp-themes/bp-default/registration/register.php	(revision 4478)
+++ bp-themes/bp-default/registration/register.php	(working copy)
@@ -253,8 +253,6 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar( 'buddypress' ) ?>
-
 	<?php do_action( 'bp_after_directory_activity_content' ) ?>
 
 	<script type="text/javascript">
Index: bp-themes/bp-default/blogs/create.php
===================================================================
--- bp-themes/bp-default/blogs/create.php	(revision 4478)
+++ bp-themes/bp-default/blogs/create.php	(working copy)
@@ -41,6 +41,4 @@
 
 	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
-
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/groups/index.php
===================================================================
--- bp-themes/bp-default/groups/index.php	(revision 4478)
+++ bp-themes/bp-default/groups/index.php	(working copy)
@@ -81,6 +81,4 @@
 
 	<?php do_action( 'bp_after_directory_groups_content' ); ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
-
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/groups/single/home.php
===================================================================
--- bp-themes/bp-default/groups/single/home.php	(revision 4478)
+++ bp-themes/bp-default/groups/single/home.php	(working copy)
@@ -78,5 +78,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-<?php get_sidebar( 'buddypress' ); ?>
-<?php get_footer( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
\ No newline at end of file
Index: bp-themes/bp-default/attachment.php
===================================================================
--- bp-themes/bp-default/attachment.php	(revision 4478)
+++ bp-themes/bp-default/attachment.php	(working copy)
@@ -70,6 +70,4 @@
 		</div><!-- .padder -->
 	</div><!-- #content -->
 
-	<?php get_sidebar(); ?>
-
 <?php get_footer(); ?>
\ No newline at end of file