Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
11/02/2009 07:54:21 PM (16 years ago)
Author:
apeatling
Message:

Merging 1.1 branch changes and syncing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-themes/bp-sn-parent/functions.php

    r2013 r2077  
    22
    33/* Register the widget columns */
    4 register_sidebars( 1, 
    5     array( 
     4register_sidebars( 1,
     5    array(
    66        'name' => 'first-section',
    77        'before_widget' => '<div id="%1$s" class="widget %2$s">',
     
    99        'before_title' => '<h2 class="widgettitle">',
    1010        'after_title' => '</h2>'
    11     ) 
     11    )
    1212);
    1313
    1414register_sidebars( 1,
    15     array( 
     15    array(
    1616        'name' => 'second-section',
    1717        'before_widget' => '<div id="%1$s" class="widget %2$s">',
     
    1919        'before_title' => '<h2 class="widgettitle">',
    2020        'after_title' => '</h2>'
    21     ) 
     21    )
    2222);
    2323
    2424register_sidebars( 1,
    25     array( 
     25    array(
    2626        'name' => 'third-section',
    2727        'before_widget' => '<div id="%1$s" class="widget %2$s">',
     
    2929        'before_title' => '<h2 class="widgettitle">',
    3030        'after_title' => '</h2>'
    31     ) 
     31    )
    3232);
    3333
    3434register_sidebars( 1,
    35     array( 
     35    array(
    3636        'name' => 'blog-sidebar',
    3737        'before_widget' => '<div id="%1$s" class="widget %2$s">',
     
    3939        'before_title' => '<h2 class="widgettitle">',
    4040        'after_title' => '</h2>'
    41     ) 
     41    )
    4242);
    4343
     
    5252function bp_dtheme_show_home_blog() {
    5353    global $bp, $query_string, $paged;
    54    
    55     if ( $bp->current_component == BP_HOME_BLOG_SLUG && ( !$bp->current_action || 'page' == $bp->current_action ) ) {               
     54
     55    if ( $bp->current_component == BP_HOME_BLOG_SLUG && ( !$bp->current_action || 'page' == $bp->current_action ) ) {
    5656        unset( $query_string );
    57        
     57
    5858        if ( ( 'page' == $bp->current_action && $bp->action_variables[0] ) && false === strpos( $query_string, 'paged' ) ) {
    5959            $query_string .= '&paged=' . $bp->action_variables[0];
     
    6262
    6363        query_posts($query_string);
    64        
     64
    6565        bp_core_load_template( 'index', true );
    6666    }
Note: See TracChangeset for help on using the changeset viewer.