Changeset 2695 for trunk/bp-core/bp-core-templatetags.php

Timestamp:

02/12/2010 12:31:49 PM (15 years ago)

Author:

apeatling

Message:

Fixing the use of deprecated template tags in bp-default. Merged the fetching of BP runtime settings into one query to significantly reduce the number of run time database hits. Fixed #1916

File:

• trunk/bp-core/bp-core-templatetags.php (modified) (9 diffs)

trunk/bp-core/bp-core-templatetags.php

@@ -393 +393 @@
     </form>
 <?php
-}
-
-function bp_home_blog_url() {
-    global $bp, $current_blog;
-
-    if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
-        $blog_id = $current_blog->blog_id;
-    } else {
-        $blog_id = BP_ROOT_BLOG;
-    }
-
-    if ( 'bphome' == get_blog_option( $blog_id, 'template' ) )
-        echo $bp->root_domain . '/' . BP_HOME_BLOG_SLUG;
-    else
-        echo $bp->root_domain;
 }
 
@@ -475 +460 @@
     echo apply_filters( 'bp_logout_nav_link', $logout_link );
 }
-    /* DEPRECATED - use bp_get_loggedin_user_nav() */
-    function bp_get_nav() { bp_get_loggedin_user_nav(); }
 
 /**
@@ -508 +491 @@
     }
 }
-    /* DEPRECATED - use bp_get_displayed_user_nav() */
-    function bp_get_user_nav() { bp_get_displayed_user_nav(); }
 
 /**
@@ -874 +855 @@
     global $bp, $is_member_page, $wp_query;
 
-    if ( $bp->current_component == BP_HOME_BLOG_SLUG )
-        return true;
-
     if ( $wp_query->is_home && !$bp->is_directory )
         return true;
@@ -1001 +979 @@
     }
 
-    if ( function_exists( 'bp_forums_setup' ) && !(int) get_site_option( 'bp-disable-forum-directory' ) ) {
+    if ( function_exists( 'bp_forums_setup' ) && !(int) $bp->site_options['bp-disable-forum-directory'] ) {
         $selection_box .= '<option value="forums">' . __( 'Forums', 'buddypress' ) . '</option>';
     }
@@ -1036 +1014 @@
 
     echo apply_filters( 'bp_logout_link', $logout_link );
-}
-
-function bp_nav_items() {
-    global $bp;
-    // This is deprecated, you should put these navigation items in your template header.php for easy editing.
-?>
-    <li<?php if ( bp_is_page( 'home' ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
-    <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
-    <li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a></li>
-
-    <?php if ( function_exists( 'groups_install' ) ) { ?>
-        <li<?php if ( bp_is_page( $bp->groups->slug ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo $bp->groups->slug ?>" title="<?php _e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a></li>
-    <?php } ?>
-
-    <?php if ( function_exists( 'bp_blogs_install' ) ) { ?>
-        <li<?php if ( bp_is_page( $bp->blogs->slug ) ) {?> class="selected"<?php } ?>><a href="<?php echo get_option('home') ?>/<?php echo $bp->blogs->slug ?>" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a></li>
-    <?php } ?>
-<?php
-    do_action( 'bp_nav_items' );
 }
 
@@ -1240 +1199 @@
 }
     function bp_get_signup_allowed() {
+        global $bp;
+
         if ( bp_core_is_multisite() ) {
-            if ( in_array( get_site_option( 'registration' ), array( 'all', 'user' ) ) )
+            if ( in_array( $bp->site_options['registration'], array( 'all', 'user' ) ) )
                 return true;
         } else {
@@ -1254 +1215 @@
 }
     function bp_get_blog_signup_allowed() {
+        global $bp;
+
         if ( !bp_core_is_multisite() )
             return false;
 
-        $status = get_site_option( 'registration' );
+        $status = $bp->site_options['registration'];
         if ( 'none' != $status && 'user' != $status )
             return true;
@@ -1284 +1247 @@
     }
 
+function bp_get_option( $option_name ) {
+    global $bp;
+
+    return apply_filters( 'bp_get_option', $bp->site_options[$option_name] );
+}
 
 /*** CUSTOM LOOP TEMPLATE CLASSES *******************/