<!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][5747] trunk/bp-themes/bp-default/functions.php: Tweak bp-default's functions.php, and add theme support for BuddyPress.</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/5747">5747</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-13 03:26:12 +0000 (Mon, 13 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak bp-default's functions.php, and add theme support for BuddyPress.</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 (5746 => 5747)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2012-02-13 01:36:07 UTC (rev 5746)
+++ trunk/bp-themes/bp-default/functions.php 2012-02-13 03:26:12 UTC (rev 5747)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_setup() {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> // Load the AJAX functions for the theme
</span><span class="cx"> require( TEMPLATEPATH . '/_inc/ajax.php' );
</span><span class="lines">@@ -66,6 +65,9 @@
</span><span class="cx"> // This theme styles the visual editor with editor-style.css to match the theme style.
</span><span class="cx"> add_editor_style();
</span><span class="cx">
</span><ins>+ // This theme comes with all the BuddyPress goodies
+ add_theme_support( 'buddypress' );
+
</ins><span class="cx"> // This theme uses post thumbnails
</span><span class="cx"> add_theme_support( 'post-thumbnails' );
</span><span class="cx">
</span><span class="lines">@@ -207,8 +209,9 @@
</span><span class="cx"> if ( current_theme_supports( 'bp-default-responsive' ) ) {
</span><span class="cx"> wp_enqueue_style( 'bp-default-responsive', get_template_directory_uri() . '/_inc/css/responsive.css', array( 'bp-default-main' ), $version );
</span><span class="cx">
</span><del>- if ( is_rtl() )
</del><ins>+ if ( is_rtl() ) {
</ins><span class="cx"> wp_enqueue_style( 'bp-default-responsive-rtl', get_template_directory_uri() . '/_inc/css/responsive-rtl.css', array( 'bp-default-responsive' ), $version );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_enqueue_scripts', 'bp_dtheme_enqueue_styles' );
</span><span class="lines">@@ -375,7 +378,7 @@
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_widgets_init() {
</span><del>- // Register the widget columns
</del><ins>+
</ins><span class="cx"> // Area 1, located in the sidebar. Empty by default.
</span><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => 'Sidebar',
</span><span class="lines">@@ -584,14 +587,11 @@
</span><span class="cx"> *
</span><span class="cx"> * Used when the custom menus haven't been configured.
</span><span class="cx"> *
</span><del>- * @global object $bp Global BuddyPress settings object
</del><span class="cx"> * @param array Menu arguments from wp_nav_menu()
</span><span class="cx"> * @see wp_nav_menu()
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_main_nav( $args ) {
</span><del>- global $bp;
-
</del><span class="cx"> $pages_args = array(
</span><span class="cx"> 'depth' => 0,
</span><span class="cx"> 'echo' => false,
</span><span class="lines">@@ -625,18 +625,16 @@
</span><span class="cx"> /**
</span><span class="cx"> * Applies BuddyPress customisations to the post comment form.
</span><span class="cx"> *
</span><del>- * @global string $user_identity The display name of the user
</del><span class="cx"> * @param array $default_labels The default options for strings, fields etc in the form
</span><span class="cx"> * @see comment_form()
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_comment_form( $default_labels ) {
</span><del>- global $user_identity;
</del><span class="cx">
</span><span class="cx"> $commenter = wp_get_current_commenter();
</span><del>- $req = get_option( 'require_name_email' );
- $aria_req = ( $req ? " aria-required='true'" : '' );
- $fields = array(
</del><ins>+ $req = get_option( 'require_name_email' );
+ $aria_req = ( $req ? " aria-required='true'" : '' );
+ $fields = array(
</ins><span class="cx"> 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name', 'buddypress' ) . ( $req ? '<span class="required"> *</span>' : '' ) . '</label> ' .
</span><span class="cx"> '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>',
</span><span class="cx"> 'email' => '<p class="comment-form-email"><label for="email">' . __( 'Email', 'buddypress' ) . ( $req ? '<span class="required"> *</span>' : '' ) . '</label> ' .
</span><span class="lines">@@ -713,9 +711,11 @@
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_sidebar_login_redirect_to() {
</span><del>- $redirect_to = apply_filters( 'bp_no_access_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' );
-?>
</del><ins>+ $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+ $redirect_to = apply_filters( 'bp_no_access_redirect', $redirect_to ); ?>
+
</ins><span class="cx"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_sidebar_login_form', 'bp_dtheme_sidebar_login_redirect_to' );
</span><span class="lines">@@ -725,18 +725,20 @@
</span><span class="cx"> /**
</span><span class="cx"> * Display navigation to next/previous pages when applicable
</span><span class="cx"> *
</span><del>- * @global unknown $wp_query
</del><ins>+ * @global WP_Query $wp_query
</ins><span class="cx"> * @param string $nav_id DOM ID for this navigation
</span><span class="cx"> * @since 1.5
</span><span class="cx"> */
</span><span class="cx"> function bp_dtheme_content_nav( $nav_id ) {
</span><span class="cx"> global $wp_query;
</span><span class="cx">
</span><del>- if ( $wp_query->max_num_pages > 1 ) : ?>
</del><ins>+ if ( !empty( $wp_query->max_num_pages ) && $wp_query->max_num_pages > 1 ) : ?>
+
</ins><span class="cx"> <div id="<?php echo $nav_id; ?>" class="navigation">
</span><span class="cx"> <div class="alignleft"><?php next_posts_link( __( '&larr; Previous Entries', 'buddypress' ) ); ?></div>
</span><span class="cx"> <div class="alignright"><?php previous_posts_link( __( 'Next Entries &rarr;', 'buddypress' ) ); ?></div>
</span><span class="cx"> </div><!-- #<?php echo $nav_id; ?> -->
</span><ins>+
</ins><span class="cx"> <?php endif;
</span><span class="cx"> }
</span><span class="cx"> endif;
</span></span></pre>
</div>
</div>
</body>
</html>