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

Timestamp:

02/10/2010 04:21:27 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1873, Fixes #1869

File:

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

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

@@ -942 +942 @@
 }
 
-function bp_is_page($page) {
-    global $bp;
-
-    if ( !$bp->displayed_user->id && $bp->current_component == $page )
-        return true;
-
-    if ( 'home' == $page && !$bp->current_component )
-        return true;
-
-    return false;
-}
-
 function bp_has_custom_signup_page() {
     if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
@@ -1391 +1379 @@
 /* Template is_() functions to determine the current page */
 
+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();
+}
+
+function bp_is_activity_front_page() {
+    return ( 'page' == get_option('show_on_front') && 'activity' == get_option('page_on_front') && $_SERVER['REQUEST_URI'] == bp_core_get_site_path() );
+}
+
+function bp_is_page($page) {
+    global $bp;
+
+    if ( !$bp->displayed_user->id && $bp->current_component == $page )
+        return true;
+
+    if ( 'home' == $page )
+        return bp_is_front_page();
+
+    return false;
+}
+
 function bp_is_active( $component ) {
     global $bp_deactivated;
@@ -1780 +1793 @@
         global $bp;
 
-        if ( is_front_page() && $bp->current_component != BP_HOME_BLOG_SLUG )
+        if ( bp_is_front_page() )
             $bp_classes[] = 'home-page';
-
-        if ( ( bp_is_blog_page() || bp_is_register_page() || bp_is_activation_page() ) && !is_page() )
-            $bp_classes[] = 'blog-page';
-
-        if ( !bp_is_blog_page() && !bp_is_register_page() && !bp_is_activation_page() )
-            $bp_classes[] = 'internal-page';
 
         if ( bp_is_directory() )
@@ -1795 +1802 @@
             $bp_classes[] = 'profile';
 
-        if ( bp_is_activity_component() && !bp_is_blog_page()  )
+        if ( bp_is_activity_component() && !bp_is_blog_page() || ( bp_is_activity_front_page() && bp_is_front_page() ) )
             $bp_classes[] = 'activity';
 
@@ -1885 +1892 @@
             $bp_classes[] = 'friends-activity';
 
-        if ( bp_is_user_activity() )
+        if ( bp_is_user_activity() && !bp_is_directory() )
             $bp_classes[] = 'my-activity';