<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2365] trunk/bp-core/bp-core-templatetags.php:
Improving page titles.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2365</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-19 16:36:58 +0000 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improving page titles.</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 (2364 => 2365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php        2010-01-19 16:19:46 UTC (rev 2364)
+++ trunk/bp-core/bp-core-templatetags.php        2010-01-19 16:36:58 UTC (rev 2365)
</span><span class="lines">@@ -887,6 +887,7 @@
</span><span class="cx">
</span><span class="cx">         if ( is_home() && bp_is_page( 'home' ) ) {
</span><span class="cx">                 $title = __( 'Home', 'buddypress' );
</span><ins>+
</ins><span class="cx">         } else if ( bp_is_blog_page() ) {
</span><span class="cx">                 if ( is_single() ) {
</span><span class="cx">                         $title = __( 'Blog &#124; ' . $post->post_title, 'buddypress' );
</span><span class="lines">@@ -898,17 +899,22 @@
</span><span class="cx">                         $title = __( 'Blog', 'buddypress' );
</span><span class="cx">
</span><span class="cx">         } else if ( !empty( $bp->displayed_user->fullname ) ) {
</span><del>-                 $title = strip_tags( $bp->displayed_user->fullname . ' &#124; ' . ucwords( $bp->current_component ) . ' &#124; ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'] );
</del><ins>+                 $title = strip_tags( $bp->displayed_user->fullname . ' &#124; ' . ucwords( $bp->current_component ) );
+
</ins><span class="cx">         } else if ( $bp->is_single_item ) {
</span><del>-                $title = ucwords( $bp->current_component ) . ' &#124; ' . $bp->bp_options_title;
</del><ins>+                $title = ucwords( $bp->current_component ) . ' &#124; ' . $bp->bp_options_title . ' &#124; ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'];
+
</ins><span class="cx">         } else if ( $bp->is_directory ) {
</span><span class="cx">                 if ( !$bp->current_component )
</span><span class="cx">                         $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( BP_MEMBERS_SLUG ) );
</span><span class="cx">                 else
</span><span class="cx">                         $title = sprintf( __( '%s Directory', 'buddypress' ), ucwords( $bp->current_component ) );
</span><del>-        } else {
-                global $post;
-                $title = get_the_title($post->ID);
</del><ins>+
+        } else if ( bp_is_register_page() ) {
+                $title = __( 'Create an Account', 'buddypress' );
+
+        } else if ( bp_is_activation_page() ) {
+                $title = __( 'Activate your Account', 'buddypress' );
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
</span><span class="lines">@@ -917,7 +923,7 @@
</span><span class="cx">                 $blog_title = get_blog_option( BP_ROOT_BLOG, 'blogname' );
</span><span class="cx">         }
</span><span class="cx">
</span><del>-        return apply_filters( 'bp_page_title', $blog_title . ' &#124; ' . attribute_escape( $title ), attribute_escape( $title ) );
</del><ins>+        return apply_filters( 'bp_page_title', $blog_title . ' &#124; ' . esc_attr( $title ), esc_attr( $title ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_styles() {
</span></span></pre>
</div>
</div>
</body>
</html>