Changeset 1887

Timestamp:

09/16/2009 07:46:47 PM (16 years ago)

Author:

apeatling

Message:

Fixes for subdirectory WPMU installations.

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (6 diffs)
• bp-forums.php (modified) (1 diff)
• bp-forums/bp-forums-bbpress.php (modified) (2 diffs)
• bp-forums/bp-forums-templatetags.php (modified) (4 diffs)
• bp-themes/bp-sn-parent/directories/forums/forums-loop.php (modified) (1 diff)

trunk/bp-core.php

@@ -388 +388 @@
     global $bp;
 
-    if ( !is_home() && is_null( $bp->displayed_user->id ) && $bp->current_component == BP_MEMBERS_SLUG ) {
+    if ( is_null( $bp->displayed_user->id ) && $bp->current_component == BP_MEMBERS_SLUG ) {
         $bp->is_directory = true;
 

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

@@ -55 +55 @@
 
     /* Loop and remove empties */
-    for ( $i = 0; $i <= count( $bp_uri ); $i++ )
-        if ( empty( $bp_uri[$i] ) ) unset( $bp_uri[$i] );
+    foreach ( (array)$bp_uri as $key => $uri_chunk )
+        if ( empty( $bp_uri[$key] ) ) unset( $bp_uri[$key] );
 
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != BP_ROOT_BLOG ) {
@@ -64 +64 @@
             array_shift( $bp_uri );
     }
-
-    /* Get total URI segment count */
-    $bp_uri_count = count( $bp_uri ) - 1;
-    $is_member_page = false;
     
     /* Set the indexes, these are incresed by one if we are not on a VHOST install */
@@ -88 +84 @@
         array_shift( $paths );
 
-    for ( $i = 0; $i < $bp_uri_count; $i++ ) {
-        if ( in_array( $bp_uri[$i], $paths )) {
-            unset( $bp_uri[$i] );
+    foreach ( (array)$bp_uri as $key => $uri_chunk ) {
+        if ( in_array( $uri_chunk, $paths )) {
+            unset( $bp_uri[$key] );
         }
     }
@@ -105 +101 @@
 
     /* Catch a member page and set the current member ID */
-    if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) ) {
+    if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) ) {      
         if ( ( $bp_uri[0] == BP_MEMBERS_SLUG && !empty( $bp_uri[1] ) ) || in_array( 'wp-load.php', $bp_uri ) ) {    
             // We are within a member page, set up user id globals
             $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
-                
+
             unset($bp_uri[0]);
             unset($bp_uri[1]);
@@ -206 +202 @@
     
     /* Don't hijack any URLs on blog pages */
-    if ( !$bp_skip_blog_check ) {
-        if ( bp_is_blog_page() )
+    if ( bp_is_blog_page() ) {
+        if ( !$bp_skip_blog_check )
             return false;
+    } else {
+        $wp_query->is_home = false;
     }
 
@@ -255 +253 @@
     if ( !$bp_path && !bp_is_blog_page() ) {
         if ( is_user_logged_in() ) {
-            wp_redirect( $bp->loggedin_user->domain );
+            wp_redirect( $bp->root_domain );
         } else {
             wp_redirect( site_url( 'wp-login.php?redirect_to=' . site_url() . $_SERVER['REQUEST_URI'] ) );

trunk/bp-forums.php

@@ -51 +51 @@
             return false;
             
+        if ( !bp_forums_is_installed_correctly() ) {
+            bp_core_add_message( 'The forums component has not been set up yet.', 'buddypress' );
+            bp_core_redirect( $bp->root_domain );
+        }
+        
         $bp->is_directory = true;
         

trunk/bp-forums/bp-forums-bbpress.php

@@ -67 +67 @@
     if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) )
         require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
-        
+    
     require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
-
     
     if ( is_object( $wp_roles ) ) {
@@ -91 +90 @@
     if ( !isset( $bb->site_id ) )
         $bb->site_id = BP_ROOT_BLOG;
-
 
     /* Check if the tables are installed, if not, install them */

trunk/bp-forums/bp-forums-templatetags.php

@@ -295 +295 @@
         return apply_filters( 'bp_get_the_topic_object_name', $forum_template->topic->object_name );
     }
-
+    
 function bp_the_topic_object_slug() {
     echo bp_get_the_topic_object_slug();
@@ -309 +309 @@
 }
     function bp_get_the_topic_object_permalink() {
-        global $forum_template;
-                
+        global $bp, $forum_template;
+        
         /* Currently this will only work with group forums, extended support in the future */
-        return apply_filters( 'bp_get_the_topic_object_permalink', $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/' );
+        return apply_filters( 'bp_get_the_topic_object_permalink', $bp->root_domain . '/' . BP_GROUPS_SLUG . '/' . $forum_template->topic->object_slug . '/forum/' );
     }
     
@@ -323 +323 @@
         return apply_filters( 'bp_get_the_topic_last_poster_name', bp_core_get_userlink( $forum_template->topic->topic_last_poster ) );
     }
-
+    
 function bp_the_topic_object_avatar( $args = '' ) {
     echo bp_get_the_topic_object_avatar( $args );
@@ -341 +341 @@
         return apply_filters( 'bp_get_the_topic_object_avatar', bp_core_fetch_avatar( array( 'item_id' => $forum_template->topic->object_id, 'type' => $type, 'object' => 'group', 'width' => $width, 'height' => $height ) ) );        
     }
-
+    
 function bp_the_topic_last_poster_avatar( $args = '' ) {
     echo bp_get_the_topic_last_poster_avatar( $args );

trunk/bp-themes/bp-sn-parent/directories/forums/forums-loop.php

@@ -40 +40 @@
             </td>
             <td class="td-group">
-                <a href="<?php bp_the_topic_object_permalink() ?>forum/"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a> 
-                <a href="<?php bp_the_topic_object_permalink() ?>forum/" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a>
+                <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a> 
+                <a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a>
             </td>
             <td class="td-postcount">