Doug Stewart avatar Doug Stewart committed d81c8f8

Non-bbPress footer and sidebars unduly affected in previous release. Oops.

Comments (0)

Files changed (6)

 
 ### VERSION HISTORY ###
 
+* Version 1.3.1
+	* **Issues Fixed**
+		* bbPress 1 column layouts no longer site-wide
 * Version 1.3
 	* **Features Added**
 		* Support for BuddyPress 1.5
 	* Initial release
 
 ### KNOWN ISSUES ###
+* Version 1.3
+	* bbPress 1 column settings apply site-wide instead of just to bbPress pages due to a flaw in selection logic.
 * Version 1.2.1
 	* <del>Proper BuddyPress 1.2.9 permalink support for single users.</del>
 * Version 1.2

bbp-wrapper-footer.php

 		</div><!-- #lb-content -->
 	</div><!-- #wrapper -->
 	
-	<?php get_sidebar(); ?>
+	<?php get_sidebar( 'bbpress' ); ?>
 	
 </div><!-- #allwrapper -->
 
-<?php get_footer(); ?>
+<?php get_footer( 'bbpress' ); ?>
 ?>
 <div id="footer">
 	<div id="footerwrapper">
-	<?php if( 1 != $lblg_options['bbp_disable_footer'] ) : ?>
 		<div id="footerleft">
 			<ul>
 			<?php if ( !dynamic_sidebar('Bottom Left') ) : ?>
 			<?php endif; ?>
 			</ul>
 		</div>
-	<?php endif; ?>
 	<div id="footercredits">
 	<?php 
 		if( $lblg_options['display_footer_copyright'] ) {

sidebar-bbpress.php

+<?php
+global $lblg_options;
+lblg_sidebar_header(); 
+?>
+<?php if( 1 != $lblg_options['bbp_force_1_column'] ) { ?>
+<div id="primarysb">
+	<ul>
+		<?php if ( !dynamic_sidebar('Primary') ) : ?>
+		<?php if( current_user_can('edit_theme_options') ){ ?>
+		<li><h4>Primary Sidebar</h4>
+			This is the primary sidebar. You may add widgets to it via the Appearance -&gt; Widgets administration screen.
+		</li>
+		<?php } ?>
+		<li><h4>Search</h4>
+			<?php get_search_form(); ?>
+		</li>
+
+		<?php endif; ?>
+	</ul>
+</div> <!-- #primarysb -->
+
+<div id="secondarysb">
+	<ul>
+		<?php if ( !dynamic_sidebar('Secondary') ) : ?>
+		<?php if( current_user_can('edit_theme_options') ){ ?>
+		<li><h4>Secondary Sidebar</h4>
+			This is the secondary sidebar. You may add widgets to it via the Appearance -&gt; Widgets administration screen.
+		</li>
+		<?php } ?>
+		<li><h4>Meta</h4>
+			<ul>
+				<li><img src="<?php echo get_template_directory_uri(); ?>/images/feed.png" /><a href="<?php bloginfo('rss2_url'); ?>">RSS Entries</a></li>
+			 	<li><img src="<?php echo get_template_directory_uri(); ?>/images/feed.png" /><a href="<?php bloginfo('comments_rss2_url'); ?>">RSS Comments</a></li>
+				<?php wp_register(); ?>
+		        <li><?php wp_loginout(); ?></li>
+			</ul>
+		</li>
+		<?php endif; ?>
+	</ul>
+</div> <!-- #secondarysb -->
+<?php
+} //endif
+lblg_sidebar_footer();
+?>
 global $lblg_options;
 lblg_sidebar_header(); 
 ?>
-<?php if( 1 != $lblg_options['bbp_force_1_column'] ) { ?>
 <div id="primarysb">
 	<ul>
 		<?php if ( !dynamic_sidebar('Primary') ) : ?>
 	</ul>
 </div> <!-- #secondarysb -->
 <?php
-} //endif
 lblg_sidebar_footer();
 ?>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.