Changeset 4920 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

08/03/2011 09:03:41 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Add bp-pages admin interface for all components. Rename bp-pages related functions to match existing nomenclature. Introduce 'has_directory' variable in BP_Component class to assist in pairing page slugs to component directories. Set 'path' variable in components that were missing them. Clean up white space where tabs were used instead of spaces. See #3428. Props boonebgorges.

File:

• trunk/bp-core/bp-core-catchuri.php (modified) (7 diffs)

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

@@ -38 +38 @@
 
     // Don't catch URIs on non-root blogs unless multiblog mode is on
-    if ( !bp_is_root_blog() && !bp_is_multiblog_mode() ) {
+    if ( !bp_is_root_blog() && !bp_is_multiblog_mode() )
         return false;
-    }
 
     // Fetch all the WP page names for each component
     if ( empty( $bp->pages ) )
-        $bp->pages = bp_core_get_page_names();
+        $bp->pages = bp_core_get_directory_pages();
 
     // Ajax or not?
@@ -78 +77 @@
                 $bkey = array_search( $chunk, $bp_uri );
 
-                if ( $bkey !== false )
+                if ( $bkey !== false ) {
                     unset( $bp_uri[$bkey] );
+                }
 
                 $bp_uri = array_values( $bp_uri );
@@ -115 +115 @@
     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 ) )
+        if ( !empty( $post ) ) {
             $bp_uri[0] = $post->post_name;
+        }
     }
 
@@ -311 +312 @@
     $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] )
+        if ( isset( $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) && $page->name == $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) {
             $object_id = $page->id;
+        }
     }
 
@@ -397 +399 @@
 
     $defaults = array(
-        'mode'      => '1',         // 1 = $root, 2 = wp-login.php
-        'message'   => __( 'You must log in to access the page you requested.', 'buddypress' ),
-        'redirect'  => wp_guess_url(),  // the URL you get redirected to when a user successfully logs in
-        'root'      => $bp->root_domain // the landing page you get redirected to when a user doesn't have access
+        'mode'     => '1',              // 1 = $root, 2 = wp-login.php
+        'message'  => __( 'You must log in to access the page you requested.', 'buddypress' ),
+        'redirect' => wp_guess_url(),   // the URL you get redirected to when a user successfully logs in
+        'root'     => $bp->root_domain  // the landing page you get redirected to when a user doesn't have access
     );
 
@@ -421 +423 @@
                 bp_core_redirect( $root );
             }
-        break;
+
+            break;
 
         // Redirect to root with "redirect_to" parameter
@@ -438 +441 @@
 
             bp_core_redirect( $url );
-        break;
+
+            break;
     }
 }