Changeset 3488

Timestamp:

11/27/2010 10:21:26 PM (14 years ago)

Author:

djpaul

Message:

Allow any component to be set to display on the front page. Fixes #2743.

Location:

trunk

Files:

• bp-core/bp-core-catchuri.php (modified) (3 diffs)
• bp-core/bp-core-signup.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (5 diffs)
• bp-themes/bp-default/functions.php (modified) (4 diffs)

trunk/bp-core/bp-core-catchuri.php

@@ -105 +105 @@
 
     // Reset the keys by merging with an empty array
-    $bp_uri             = array_merge( array(), $bp_uri );
-    $bp_unfiltered_uri  = $bp_uri;
+    $bp_uri            = array_merge( array(), $bp_uri );
+    $bp_unfiltered_uri = $bp_uri;
+
+    // If a component is set to the front page, force its name into $bp_uri so that $current_component is populated
+    if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && empty( $bp_uri ) ) {
+        $post = get_post( get_option( 'page_on_front' ) );
+        if ( !empty( $post ) )
+            $bp_uri[0] = $post->post_name;
+    }
 
     // Find a match within registered BuddyPress controlled WP pages (check members first)
@@ -215 +222 @@
  * @package BuddyPress Core
  * @param $username str Username to check.
- * @global $wpdb WordPress DB access object.
- * @return false on no match
- * @return int the user ID of the matched user.
+ * @return false|int The user ID of the matched user, or false.
  */
 function bp_core_load_template( $templates ) {
-    global $post, $bp, $wpdb, $wp_query, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
+    global $bp, $wpdb, $wp_query, $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
 
     // Determine if the root object WP page exists for this request (TODO: is there an API function for this?
-    if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
-        return false;
-
-    // Set the root object as the current wp_query-ied item
-    $object_id = 0;
-    foreach ( (array)$bp->pages as $page ) {
-        if ( isset( $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) && $page->name == $bp_unfiltered_uri[$bp_unfiltered_uri_offset] )
-            $object_id = $page->id;
-    }
-
-    // Make the queried/post object an actual valid page
-    if ( !empty( $object_id ) ) {
-        $wp_query->queried_object = &get_post( $object_id );
-        $wp_query->queried_object_id = $object_id;
-
-        $post = $wp_query->queried_object;
-    }
+    if ( !empty( $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) )
+        if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
+            return false;
 
     // Fetch each template and add the php suffix
@@ -246 +237 @@
 
     // Filter the template locations so that plugins can alter where they are located
-    if ( $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates ) ) {
-        // Template was located, lets set this as a valid page and not a 404.
-        status_header( 200 );
-        $wp_query->is_page = true;
-        $wp_query->is_404 = false;
-
+    if ( $located_template = apply_filters( 'bp_located_template', locate_template( (array) $filtered_templates, false ), $filtered_templates ) )
         load_template( apply_filters( 'bp_load_template', $located_template ) );
-    }
 
     // Kill any other output after this.

trunk/bp-core/bp-core-signup.php

@@ -16 +16 @@
 
     $bp->is_directory = false;
+    
+    if ( bp_is_component_front_page( 'register' ) && ( is_user_logged_in() || !bp_get_signup_allowed() ) )
+        bp_core_redirect( $bp->root_domain . '/' . $bp->members->slug );
 
     /* If the user is logged in, redirect away from here */

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

@@ -1518 +1518 @@
 /* Template is_() functions to determine the current page */
 
+/**
+ * Checks if the site's front page is set to the specified BuddyPress component page in wp-admin's Settings > Reading screen.
+ *
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ * @global $current_blog WordPress global containing information and settings for the current blog being viewed.
+ * @param string $component Optional; name of the component to check for. If not specified, uses $bp->current_component.
+ * @return bool True if the specified component is set to be the site's front page.
+ * @since 1.3
+ */
+function bp_is_component_front_page( $component='' ) {
+    global $bp, $current_blog;
+
+    if ( !$component && !empty( $bp->current_component ) )
+        $component = $bp->current_component;
+
+    if ( is_main_site() )
+        $path = bp_core_get_site_path();
+    else
+        $path = $current_blog->path;
+        
+    if ( 'page' != get_option( 'show_on_front' ) || !$component || empty( $bp->pages->{$component} ) || $_SERVER['REQUEST_URI'] != $path )
+        return false;
+
+    return apply_filters( 'bp_is_component_front_page', ( $bp->pages->{$component}->id == get_option( 'page_on_front' ) ), $component );
+}
+
 function bp_is_blog_page() {
     global $bp, $is_member_page, $wp_query;
@@ -1542 +1568 @@
 function bp_is_home() { return bp_is_my_profile(); }
 
+/**
+ * Is the user on the front page of the site?
+ *
+ * @deprecated 1.3
+ * @deprecated Use is_front_page()
+ * @return bool
+ */
 function bp_is_front_page() {
-    if ( 'posts' == get_option('show_on_front') && is_home() )
-        return true;
-    else if ( bp_is_activity_front_page() )
-        return true;
-    else
-        return is_front_page();
-}
-
+    _deprecated_function( __FUNCTION__, '1.3', "is_front_page()" );
+    return is_front_page();
+}
+
+/**
+ * Is the front page of the site set to the Activity component?
+ *
+ * @deprecated 1.3
+ * @deprecated Use bp_is_component_front_page( 'activity' )
+ * @return bool
+ */
 function bp_is_activity_front_page() {
-    global $current_blog;
-
-    if ( is_main_site() )
-        $path = bp_core_get_site_path();
-    else
-        $path = $current_blog->path;
-
-    return ( 'page' == get_option('show_on_front') && 'activity' == get_option('page_on_front') && $_SERVER['REQUEST_URI'] == $path );
+    _deprecated_function( __FUNCTION__, '1.3', "bp_is_component_front_page( 'activity' )" );
+    return bp_is_component_front_page( 'activity' );
 }
 
@@ -1980 +2010 @@
         $bp_classes = array();
 
-        if ( bp_is_front_page() )
+        if ( is_front_page() )
             $bp_classes[] = 'home-page';
 
@@ -1989 +2019 @@
             $bp_classes[] = 'profile';
 
-        if ( bp_is_activity_component() && !bp_is_blog_page() || ( bp_is_activity_front_page() && bp_is_front_page() ) )
+        if ( bp_is_activity_component() && !bp_is_blog_page() )
             $bp_classes[] = 'activity';
 
-        if ( bp_is_blogs_component() && !bp_is_blog_page()  )
+        if ( bp_is_blogs_component() && !bp_is_blog_page() )
             $bp_classes[] = 'blogs';
 
@@ -1998 +2028 @@
             $bp_classes[] = 'messages';
 
-        if ( bp_is_friends_component() && !bp_is_blog_page()  )
+        if ( bp_is_friends_component() && !bp_is_blog_page() )
             $bp_classes[] = 'friends';
 
-        if ( bp_is_groups_component() && !bp_is_blog_page()  )
+        if ( bp_is_groups_component() && !bp_is_blog_page() )
             $bp_classes[] = 'groups';
 

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

@@ -155 +155 @@
 
 /**
- * Filter the dropdown for selecting the page to show on front to include "Activity Stream"
- *
+ * In BuddyPress 1.2.x, this function filtered the dropdown on the Settings > Reading screen for selecting
+ * the page to show on front to include "Activity Stream."
+ * As of 1.3.x, it is no longer required.
+ *
+ * @deprecated 1.3
+ * @deprecated No longer required.
  * @param string $page_html A list of pages as a dropdown (select list)
+ * @return string
  * @see wp_dropdown_pages()
- * @return string
- * @package BuddyPress Theme
  * @since 1.2
  */
 function bp_dtheme_wp_pages_filter( $page_html ) {
-    if ( !bp_is_active( 'activity' ) )
-        return $page_html;
-
-    if ( 'page_on_front' != substr( $page_html, 14, 13 ) )
-        return $page_html;
-
-    $selected = false;
-    $page_html = str_replace( '</select>', '', $page_html );
-
-    if ( bp_dtheme_page_on_front() == 'activity' )
-        $selected = ' selected="selected"';
-
-    $page_html .= '<option class="level-0" value="activity"' . $selected . '>' . __( 'Activity Stream', 'buddypress' ) . '</option></select>';
+    _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
     return $page_html;
 }
-add_filter( 'wp_dropdown_pages', 'bp_dtheme_wp_pages_filter' );
-
-/**
- * Hijack the saving of page on front setting to save the activity stream setting
- *
+
+/**
+ * In BuddyPress 1.2.x, this function hijacked the saving of page on front setting to save the activity stream setting.
+ * As of 1.3.x, it is no longer required.
+ *
+ * @deprecated 1.3
+ * @deprecated No longer required.
  * @param $string $oldvalue Previous value of get_option( 'page_on_front' )
  * @param $string $oldvalue New value of get_option( 'page_on_front' )
  * @return string
- * @package BuddyPress Theme
  * @since 1.2
  */
 function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
+    _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
     if ( !is_admin() || !is_super_admin() )
         return false;
 
-    if ( 'activity' == $_POST['page_on_front'] )
-        return 'activity';
-    else
-        return $oldvalue;
-}
-add_action( 'pre_update_option_page_on_front', 'bp_dtheme_page_on_front_update', 10, 2 );
-
-/**
- * Load the activity stream template if settings allow
- *
+    return $oldvalue;
+}
+
+/**
+ * In BuddyPress 1.2.x, this function loaded the activity stream template if the front page display settings allow.
+ * As of 1.3.x, it is no longer required.
+ *
+ * @deprecated 1.3
+ * @deprecated No longer required.
  * @param string $template Absolute path to the page template 
  * @return string
- * @global WP_Query $wp_query WordPress query object
- * @package BuddyPress Theme
  * @since 1.2
  */
 function bp_dtheme_page_on_front_template( $template ) {
-    global $wp_query;
-
-    if ( empty( $wp_query->post->ID ) )
-        return locate_template( array( 'activity/index.php' ), false );
-    else
-        return $template;
-}
-add_filter( 'page_template', 'bp_dtheme_page_on_front_template' );
+    _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
+    return $template;
+}
 
 /**
@@ -224 +209 @@
  *
  * @return false|int ID of page set as the home page
- * @package BuddyPress Theme
  * @since 1.2
  */
@@ -235 +219 @@
 
 /**
- * Force the page ID as a string to stop the get_posts query from kicking up a fuss.
- *
- * @global WP_Query $wp_query WordPress query object
- * @package BuddyPress Theme
+ * In BuddyPress 1.2.x, this forced the page ID as a string to stop the get_posts query from kicking up a fuss.
+ * As of 1.3.x, it is no longer required.
+ *
+ * @deprecated 1.3
+ * @deprecated No longer required.
  * @since 1.2
  */
 function bp_dtheme_fix_get_posts_on_activity_front() {
-    global $wp_query;
-
-    if ( !empty($wp_query->query_vars['page_id']) && 'activity' == $wp_query->query_vars['page_id'] )
-        $wp_query->query_vars['page_id'] = '"activity"';
-}
-add_action( 'pre_get_posts', 'bp_dtheme_fix_get_posts_on_activity_front' );
-
-/**
- * WP 3.0 requires there to be a non-null post in the posts array
- *
+    _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
+}
+
+/**
+ * In BuddyPress 1.3, this was used as part of the code that set the activity stream to be on the front page.
+ * As of 1.3.x, it is no longer required.
+ *
+ * @deprecated 1.3
+ * @deprecated No longer required.
  * @param array $posts Posts as retrieved by WP_Query
- * @global WP_Query $wp_query WordPress query object
  * @return array
- * @package BuddyPress Theme
  * @since 1.2.5
  */
 function bp_dtheme_fix_the_posts_on_activity_front( $posts ) {
-    global $wp_query;
-
-    // NOTE: the double quotes around '"activity"' are thanks to our previous function bp_dtheme_fix_get_posts_on_activity_front()
-    if ( empty( $posts ) && !empty( $wp_query->query_vars['page_id'] ) && '"activity"' == $wp_query->query_vars['page_id'] )
-        $posts = array( (object) array( 'ID' => 'activity' ) );
-
+    _deprecated_function( __FUNCTION__, '1.3', "No longer required." );
     return $posts;
 }
-add_filter( 'the_posts', 'bp_dtheme_fix_the_posts_on_activity_front' );
 
 /**
@@ -406 +382 @@
 ?>
     <ul id="nav">
-        <li<?php if ( bp_is_front_page() ) : ?> class="selected"<?php endif; ?>>
+        <li<?php if ( is_front_page() ) : ?> class="selected"<?php endif; ?>>
             <a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
         </li>