<!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][3730] trunk/bp-core/bp-core-templatetags.php: Correct phpdoc for bp_get_displayed_user_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>3730</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-01-18 18:03:57 +0000 (Tue, 18 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct phpdoc for bp_get_displayed_user_nav(). Fixes #3011, props LanceHudson</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (3729 => 3730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2011-01-18 13:30:28 UTC (rev 3729)
+++ trunk/bp-core/bp-core-templatetags.php 2011-01-18 18:03:57 UTC (rev 3730)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> function bp_directory_members_search_form() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- $default_search_value = bp_get_search_default_text();
</del><ins>+ $default_search_value = bp_get_search_default_text();
</ins><span class="cx"> $search_value = !empty( $_REQUEST['s'] ) ? stripslashes( $_REQUEST['s'] ) : $default_search_value;
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="lines">@@ -533,10 +533,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * bp_get_displayed_user_nav()
- * TEMPLATE TAG
- *
- * Uses the $bp->bp_users_nav global to render out the user navigation when viewing another user other than
</del><ins>+ * Uses the $bp->bp_nav global to render out the user navigation when viewing another user other than
</ins><span class="cx"> * yourself.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="lines">@@ -582,11 +579,11 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_get_options_nav() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> // If we are looking at a member profile, then the we can use the current component as an
</span><span class="cx"> // index. Otherwise we need to use the component's root_slug
</span><span class="cx"> $component_index = !empty( $bp->displayed_user ) ? $bp->current_component : bp_get_root_slug( $bp->current_component );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( count( $bp->bp_options_nav[$component_index] ) < 1 )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -1052,24 +1049,24 @@
</span><span class="cx"> return apply_filters( 'bp_search_form_type_select', $selection_box );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
- * Get the default text for the search box for a given component.
- *
- * @global object $bp BuddyPress global settings
- * @return string
- * @since 1.3
- */
-function bp_search_default_text() {
- echo bp_get_search_default_text();
-}
- function bp_get_search_default_text( $component = false ) {
- global $bp;
-
- if ( empty( $component ) )
</del><ins>+/**
+ * Get the default text for the search box for a given component.
+ *
+ * @global object $bp BuddyPress global settings
+ * @return string
+ * @since 1.3
+ */
+function bp_search_default_text() {
+ echo bp_get_search_default_text();
+}
+ function bp_get_search_default_text( $component = false ) {
+ global $bp;
+
+ if ( empty( $component ) )
</ins><span class="cx"> $component = $bp->current_component;
</span><del>-
</del><ins>+
</ins><span class="cx"> $default_text = __( 'Search anything...', 'buddypress' );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $bp->default_search_strings[$component] ) ) {
</span><span class="cx"> // Most of the time, $component will be the actual component name
</span><span class="cx"> $default_text = $bp->default_search_strings[$component];
</span><span class="lines">@@ -1082,10 +1079,10 @@
</span><span class="cx"> $default_text = $bp->default_search_strings[$key];
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- return apply_filters( 'bp_search_default_text', $default_text, $component );
- }
</del><span class="cx">
</span><ins>+ return apply_filters( 'bp_search_default_text', $default_text, $component );
+ }
+
</ins><span class="cx"> function bp_search_form() {
</span><span class="cx"> $form = '
</span><span class="cx"> <form action="' . bp_search_form_action() . '" method="post" id="search-form">
</span><span class="lines">@@ -1120,7 +1117,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Creates and outputs a button.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param array $args See bp_get_button() for the list of arguments.
</span><span class="cx"> * @see bp_get_button()
</span><span class="cx"> */
</span><span class="lines">@@ -1173,12 +1170,12 @@
</span><span class="cx"> $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
</span><span class="cx">
</span><span class="cx"> preg_match( "%\s*((?:<[^>]+>)+\S*)\s*|\s+%s", $text, $matches, PREG_OFFSET_CAPTURE, $excerpt_length );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $matches ) ) {
</span><del>- $pos = array_pop( array_pop( $matches ) );
</del><ins>+ $pos = array_pop( array_pop( $matches ) );
</ins><span class="cx"> $text = substr( $text, 0, $pos ) . ' [...]';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_create_excerpt', $text, $original_text );
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'bp_create_excerpt', 'wp_trim_excerpt' );
</span><span class="lines">@@ -1605,7 +1602,7 @@
</span><span class="cx"> $component_name = $bp->active_components[$component];
</span><span class="cx">
</span><span class="cx"> // Component has specific root slug
</span><del>- if ( !empty( $bp->{$component_name}->root_slug ) )
</del><ins>+ if ( !empty( $bp->{$component_name}->root_slug ) )
</ins><span class="cx"> $root_slug = $bp->{$component_name}->root_slug;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1903,7 +1900,7 @@
</span><span class="cx">
</span><span class="cx"> function bp_is_user_groups() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( bp_is_current_component( BP_GROUPS_SLUG ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -1912,7 +1909,7 @@
</span><span class="cx">
</span><span class="cx"> function bp_is_group() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( bp_is_current_component( BP_GROUPS_SLUG ) && isset( $bp->groups->current_group ) && $bp->groups->current_group )
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>