Changeset 5747

Timestamp:

02/13/2012 03:26:12 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Tweak bp-default's functions.php, and add theme support for BuddyPress.

File:

• trunk/bp-themes/bp-default/functions.php (modified) (11 diffs)

trunk/bp-themes/bp-default/functions.php

@@ -59 +59 @@
  */
 function bp_dtheme_setup() {
-    global $bp;
 
     // Load the AJAX functions for the theme
@@ -66 +65 @@
     // This theme styles the visual editor with editor-style.css to match the theme style.
     add_editor_style();
+
+    // This theme comes with all the BuddyPress goodies
+    add_theme_support( 'buddypress' );
 
     // This theme uses post thumbnails
@@ -208 +210 @@
         wp_enqueue_style( 'bp-default-responsive', get_template_directory_uri() . '/_inc/css/responsive.css', array( 'bp-default-main' ), $version );
 
-        if ( is_rtl() )
+        if ( is_rtl() ) {
             wp_enqueue_style( 'bp-default-responsive-rtl', get_template_directory_uri() . '/_inc/css/responsive-rtl.css', array( 'bp-default-responsive' ), $version );
+        }
     }
 }
@@ -376 +379 @@
  */
 function bp_dtheme_widgets_init() {
-    // Register the widget columns
+
     // Area 1, located in the sidebar. Empty by default.
     register_sidebar( array(
@@ -585 +588 @@
  * Used when the custom menus haven't been configured.
  *
- * @global object $bp Global BuddyPress settings object
  * @param array Menu arguments from wp_nav_menu()
  * @see wp_nav_menu()
@@ -591 +593 @@
  */
 function bp_dtheme_main_nav( $args ) {
-    global $bp;
-
     $pages_args = array(
         'depth'      => 0,
@@ -626 +626 @@
  * Applies BuddyPress customisations to the post comment form.
  *
- * @global string $user_identity The display name of the user
  * @param array $default_labels The default options for strings, fields etc in the form
  * @see comment_form()
@@ -632 +631 @@
  */
 function bp_dtheme_comment_form( $default_labels ) {
-    global $user_identity;
 
     $commenter = wp_get_current_commenter();
-    $req = get_option( 'require_name_email' );
-    $aria_req = ( $req ? " aria-required='true'" : '' );
-    $fields =  array(
+    $req       = get_option( 'require_name_email' );
+    $aria_req  = ( $req ? " aria-required='true'" : '' );
+    $fields    =  array(
         'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name', 'buddypress' ) . ( $req ? '<span class="required"> *</span>' : '' ) . '</label> ' .
                     '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>',
@@ -714 +712 @@
  */
 function bp_dtheme_sidebar_login_redirect_to() {
-    $redirect_to = apply_filters( 'bp_no_access_redirect', !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '' );
-?>
+    $redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+    $redirect_to = apply_filters( 'bp_no_access_redirect', $redirect_to ); ?>
+
     <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
+
 <?php
 }
@@ -726 +726 @@
  * Display navigation to next/previous pages when applicable
  *
- * @global unknown $wp_query
+ * @global WP_Query $wp_query
  * @param string $nav_id DOM ID for this navigation
  * @since 1.5
@@ -733 +733 @@
     global $wp_query;
 
-    if ( $wp_query->max_num_pages > 1 ) : ?>
+    if ( !empty( $wp_query->max_num_pages ) && $wp_query->max_num_pages > 1 ) : ?>
+
         <div id="<?php echo $nav_id; ?>" class="navigation">
             <div class="alignleft"><?php next_posts_link( __( '&larr; Previous Entries', 'buddypress' ) ); ?></div>
             <div class="alignright"><?php previous_posts_link( __( 'Next Entries &rarr;', 'buddypress' ) ); ?></div>
         </div><!-- #<?php echo $nav_id; ?> -->
+
     <?php endif;
 }