<!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][5134] trunk: Add missing _is_ functions for Settings component and introduce fallback template file in /bp-default/members/single/.</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><a href="http://buddypress.trac.wordpress.org/changeset/5134">5134</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-09-09 21:10:47 +0000 (Fri, 09 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add missing _is_ functions for Settings component and introduce fallback template file in /bp-default/members/single/.
Fix issue where BuddyBar Settings links were incorrectly using displayed_user, even when no user was displayed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpsettingsbpsettingsloaderphp">trunk/bp-settings/bp-settings-loader.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglehomephp">trunk/bp-themes/bp-default/members/single/home.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultmemberssinglesettingsphp">trunk/bp-themes/bp-default/members/single/settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (5133 => 5134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-09-09 18:31:03 UTC (rev 5133)
+++ trunk/bp-core/bp-core-template.php 2011-09-09 21:10:47 UTC (rev 5134)
</span><span class="lines">@@ -1243,6 +1243,66 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Is this a user's settings page?
+ *
+ * @package BuddyPress
+ *
+ * @return bool
+ */
+function bp_is_user_settings() {
+ if ( bp_is_user() && bp_is_settings_component() )
+ return true;
+
+ return false;
+}
+
+/**
+ * Is this a user's General Settings page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_settings_general() {
+ if ( bp_is_user_settings() && bp_is_current_action( 'general' ) )
+ return true;
+
+ return false;
+}
+
+/**
+ * Is this a user's Notification Settings page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_settings_notifications() {
+ if ( bp_is_user_settings() && bp_is_current_action( 'notifications' ) )
+ return true;
+
+ return false;
+}
+
+/**
+ * Is this a user's Account Deletion page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_settings_account_delete() {
+ if ( bp_is_user_settings() && bp_is_current_action( 'delete-account' ) )
+ return true;
+
+ return false;
+}
+
+
</ins><span class="cx"> /** Groups ******************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_is_group() {
</span></span></pre></div>
<a id="trunkbpsettingsbpsettingsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-loader.php (5133 => 5134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-loader.php 2011-09-09 18:31:03 UTC (rev 5133)
+++ trunk/bp-settings/bp-settings-loader.php 2011-09-09 21:10:47 UTC (rev 5134)
</span><span class="lines">@@ -77,8 +77,16 @@
</span><span class="cx"> 'default_subnav_slug' => 'general'
</span><span class="cx"> );
</span><span class="cx">
</span><del>- $settings_link = trailingslashit( $bp->displayed_user->domain . $this->slug );
</del><ins>+ // Determine user to use
+ if ( isset( $bp->displayed_user->domain ) )
+ $user_domain = $bp->displayed_user->domain;
+ elseif ( isset( $bp->loggedin_user->domain ) )
+ $user_domain = $bp->loggedin_user->domain;
+ else
+ return;
</ins><span class="cx">
</span><ins>+ $settings_link = trailingslashit( $user_domain . $this->slug );
+
</ins><span class="cx"> // Add General Settings nav item
</span><span class="cx"> $sub_nav[] = array(
</span><span class="cx"> 'name' => __( 'General', 'buddypress' ),
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/home.php (5133 => 5134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/home.php 2011-09-09 18:31:03 UTC (rev 5133)
+++ trunk/bp-themes/bp-default/members/single/home.php 2011-09-09 21:10:47 UTC (rev 5134)
</span><span class="lines">@@ -39,29 +39,32 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_body' );
</span><span class="cx">
</span><span class="cx"> if ( bp_is_user_activity() || !bp_current_component() ) :
</span><del>- locate_template( array( 'members/single/activity.php' ), true );
</del><ins>+ locate_template( array( 'members/single/activity.php' ), true );
</ins><span class="cx">
</span><span class="cx"> elseif ( bp_is_user_blogs() ) :
</span><del>- locate_template( array( 'members/single/blogs.php' ), true );
</del><ins>+ locate_template( array( 'members/single/blogs.php' ), true );
</ins><span class="cx">
</span><span class="cx"> elseif ( bp_is_user_friends() ) :
</span><del>- locate_template( array( 'members/single/friends.php' ), true );
</del><ins>+ locate_template( array( 'members/single/friends.php' ), true );
</ins><span class="cx">
</span><span class="cx"> elseif ( bp_is_user_groups() ) :
</span><del>- locate_template( array( 'members/single/groups.php' ), true );
</del><ins>+ locate_template( array( 'members/single/groups.php' ), true );
</ins><span class="cx">
</span><span class="cx"> elseif ( bp_is_user_messages() ) :
</span><del>- locate_template( array( 'members/single/messages.php' ), true );
</del><ins>+ locate_template( array( 'members/single/messages.php' ), true );
</ins><span class="cx">
</span><span class="cx"> elseif ( bp_is_user_profile() ) :
</span><del>- locate_template( array( 'members/single/profile.php' ), true );
</del><ins>+ locate_template( array( 'members/single/profile.php' ), true );
</ins><span class="cx">
</span><span class="cx"> elseif ( bp_is_user_forums() ) :
</span><del>- locate_template( array( 'members/single/forums.php' ), true );
</del><ins>+ locate_template( array( 'members/single/forums.php' ), true );
</ins><span class="cx">
</span><ins>+ elseif ( bp_is_user_settings() ) :
+ locate_template( array( 'members/single/settings.php' ), true );
+
</ins><span class="cx"> // If nothing sticks, load a generic template
</span><span class="cx"> else :
</span><del>- locate_template( array( 'members/single/front.php' ), true );
</del><ins>+ locate_template( array( 'members/single/plugins.php' ), true );
</ins><span class="cx">
</span><span class="cx"> endif;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglesettingsphp"></a>
<div class="addfile"><h4>Added: trunk/bp-themes/bp-default/members/single/settings.php (0 => 5134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/settings.php (rev 0)
+++ trunk/bp-themes/bp-default/members/single/settings.php 2011-09-09 21:10:47 UTC (rev 5134)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<?php
+
+/**
+ * BuddyPress - Users Settings
+ *
+ * @package BuddyPress
+ * @subpackage bp-default
+ */
+
+?>
+
+<div class="item-list-tabs no-ajax" id="subnav" role="navigation">
+ <ul>
+ <?php if ( bp_is_my_profile() ) : ?>
+
+ <?php bp_get_options_nav(); ?>
+
+ <?php endif; ?>
+ </ul>
+</div>
+
+<?php
+
+if ( bp_is_current_action( 'notifications' ) ) :
+ locate_template( array( 'members/single/settings/notifications.php' ), true );
+
+elseif ( bp_is_current_action( 'delete-account' ) ) :
+ locate_template( array( 'members/single/settings/delete-account.php' ), true );
+
+elseif ( bp_is_current_action( 'general' ) ) :
+ locate_template( array( 'members/single/settings/general.php' ), true );
+
+else :
+ locate_template( array( 'members/single/plugins.php' ), true );
+
+endif;
+
+?>
</ins><span class="cx">Property changes on: trunk/bp-themes/bp-default/members/single/settings.php
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
</div>
</body>
</html>