<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][3653] trunk/bp-themes/bp-default/functions.php: Use wp_page_menu's show_home parameter to create the "home" item in the main nav.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3653</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-01-04 19:10:08 +0000 (Tue, 04 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use wp_page_menu's show_home parameter to create the "home" item in the main nav. Fixes #2994</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (3652 => 3653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2011-01-04 13:30:29 UTC (rev 3652)
+++ trunk/bp-themes/bp-default/functions.php 2011-01-04 19:10:08 UTC (rev 3653)
</span><span class="lines">@@ -473,8 +473,8 @@
</span><span class="cx"> *
</span><span class="cx"> * Used when the custom menus haven't been configured.
</span><span class="cx"> *
</span><ins>+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
</ins><span class="cx"> * @param array Menu arguments from wp_nav_menu()
</span><del>- * @package BuddyPress Theme
</del><span class="cx"> * @see wp_nav_menu()
</span><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span><span class="lines">@@ -482,9 +482,10 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> $pages_args = array(
</span><del>- 'title_li' => '',
- 'depth' => '0',
- 'exclude' => bp_dtheme_page_on_front()
</del><ins>+ 'depth' => 0,
+ 'echo' => false,
+ 'exclude' => '',
+ 'title_li' => ''
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( bp_forum_directory_is_disabled() ) {
</span><span class="lines">@@ -493,20 +494,29 @@
</span><span class="cx">
</span><span class="cx"> $pages_args['exclude'] .= $bp->pages->forums->id;
</span><span class="cx"> }
</span><del>-?>
- <ul id="nav">
- <li<?php if ( is_front_page() ) : ?> class="selected"<?php endif; ?>>
- <a href="<?php echo home_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
- </li>
</del><span class="cx">
</span><del>- <?php wp_list_pages( $pages_args ) ?>
- <?php do_action( 'bp_nav_items' ) ?>
- </ul><!-- #nav -->
-<?php
</del><ins>+ $menu = wp_page_menu( $pages_args );
+ $menu = str_replace( array( '<div class="menu"><ul>', '</ul></div>' ), array( '<ul id="nav">', '</ul><!-- #nav -->' ), $menu );
+ echo $menu;
+
+ do_action( 'bp_nav_items' );
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get our wp_nav_menu() fallback, bp_dtheme_main_nav(), to show a home link.
+ *
+ * @param array $args Default values for wp_page_menu()
+ * @see wp_page_menu()
+ * @since 1.3
+ */
+function bp_dtheme_page_menu_args( $args ) {
+ $args['show_home'] = true;
+ return $args;
+}
+add_filter( 'wp_page_menu_args', 'bp_dtheme_page_menu_args' );
+
+/**
</ins><span class="cx"> * Applies BuddyPress customisations to the post comment form.
</span><span class="cx"> *
</span><span class="cx"> * @global string $user_identity The display name of the user
</span></span></pre>
</div>
</div>
</body>
</html>