Changeset 2227

Timestamp:

12/30/2009 03:18:18 PM (17 years ago)

Author:

apeatling

Message:

Fixed support for single WP in a subdirectory.

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (2 diffs)

trunk/bp-core.php

@@ -1478 +1478 @@
  */
 function bp_core_get_site_path() {
-        global $current_site;
-
-        return $current_site->path;
+        global $bp, $current_site;
+
+        if ( bp_core_is_multiblog_install() )
+                $path = $current_site->path;
+        else {
+                $site_path = (array) explode( '/', site_url() );
+
+                if ( count( $site_path ) < 2 )
+                        $site_path = '/';
+                else {
+                        /* Unset the first three segments (http(s):// part) */
+                        unset( $site_path[0] );
+                        unset( $site_path[1] );
+                        unset( $site_path[2] );
+
+                        $site_path = implode( '/', $site_path );
+                }
+        }
+
+        return apply_filters( 'bp_core_get_site_path', $site_path );
 }
 

trunk/bp-core/bp-core-cssjs.php

@@ -169 +169 @@
 
         echo
-'<script type="text/javascript">var ajaxurl = "' . $bp->root_domain . str_replace( 'index.php', 'wp-load.php', $_SERVER['SCRIPT_NAME'] ) . '";</script>
+'<script type="text/javascript">var ajaxurl = "' . site_url( 'wp-load.php' ) . '";</script>
 ';
 }

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

@@ -852 +852 @@
         } else if ( bp_is_blog_page() ) {
                 if ( is_single() ) {
-                        $title = __( 'Blog — ' . $post->post_title, 'buddypress' );
+                        $title = __( 'Blog | ' . $post->post_title, 'buddypress' );
                 } else if ( is_category() ) {
-                        $title = __( 'Blog — Categories — ' . ucwords( $wp_query->query_vars['category_name'] ), 'buddypress' );
+                        $title = __( 'Blog | Categories | ' . ucwords( $wp_query->query_vars['category_name'] ), 'buddypress' );
                 } else if ( is_tag() ) {
-                        $title = __( 'Blog — Tags — ' . ucwords( $wp_query->query_vars['tag'] ), 'buddypress' );
+                        $title = __( 'Blog | Tags | ' . ucwords( $wp_query->query_vars['tag'] ), 'buddypress' );
                 } else
                         $title = __( 'Blog', 'buddypress' );
 
         } else if ( !empty( $bp->displayed_user->fullname ) ) {
-                $title = strip_tags( $bp->displayed_user->fullname . ' — ' . ucwords( $bp->current_component ) . ' — ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'] );
+                $title = strip_tags( $bp->displayed_user->fullname . ' | ' . ucwords( $bp->current_component ) . ' | ' . $bp->bp_options_nav[$bp->current_component][$bp->current_action]['name'] );
         } else if ( $bp->is_single_item ) {
-                $title = ucwords( $bp->current_component ) . ' — ' . $bp->bp_options_title;
+                $title = ucwords( $bp->current_component ) . ' | ' . $bp->bp_options_title;
         } else if ( $bp->is_directory ) {
                 if ( !$bp->current_component )
@@ -880 +880 @@
         }
 
-        return apply_filters( 'bp_page_title', $blog_title . ' — ' . attribute_escape( $title ), attribute_escape( $title ) );
+        return apply_filters( 'bp_page_title', $blog_title . ' | ' . attribute_escape( $title ), attribute_escape( $title ) );
 }