Changeset 3751 for trunk/bp-core/admin/bp-core-update.php

Timestamp:

01/20/2011 03:56:04 AM (15 years ago)

Author:

johnjamesjacoby

Message:

First pass at BP_Component class. Refactor Activity component to use BP_Component. Introduce page templates for root directories. Rename bp-activity-templatetags to bp-activity-template per WP coding standards. Split bp-activity up into smaller parts. Introduce get_slug functions for activity component. More refactoring to do on other components. This will temporarily break trunk while refactoring happens, so be sure to pin to the previous revision if needed.

File:

• trunk/bp-core/admin/bp-core-update.php (modified) (2 diffs)

trunk/bp-core/admin/bp-core-update.php

@@ -323 +323 @@
 
     function step_pages() {
+        global $bp;
+
         if ( !current_user_can( 'activate_plugins' ) )
             return false;
 
+        // Determine where to get the pages from
         if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() )
             $existing_pages = get_blog_option( BP_ROOT_BLOG, 'bp-pages' );
@@ -331 +334 @@
             $existing_pages = get_option( 'bp-pages' );
 
+        // Get disabled components
         $disabled_components = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
 
         // Check for defined slugs
-        if ( defined( 'BP_MEMBERS_SLUG' ) && BP_MEMBERS_SLUG )
-            $members_slug = constant( 'BP_MEMBERS_SLUG' );
+        if ( isset( $bp->members->slug ) )
+            $members_slug = $bp->members->slug;
         else
-            $members_slug = __( 'members', 'buddypress' );
-
-        if ( defined( 'BP_GROUPS_SLUG' ) && BP_GROUPS_SLUG )
+            $members_slug = __( 'Members', 'buddypress' );
+
+        // Groups
+        if ( isset( $bp->groups->slug ) )
             $groups_slug = constant( 'BP_GROUPS_SLUG' );
         else
-            $groups_slug = __( 'groups', 'buddypress' );
-
-        if ( defined( 'BP_ACTIVITY_SLUG' ) && BP_ACTIVITY_SLUG )
-            $activity_slug = constant( 'BP_ACTIVITY_SLUG' );
+            $groups_slug = __( 'Groups', 'buddypress' );
+
+        // Activity
+        if ( isset( $bp->activity->slug ) )
+            $activity_slug = $bp->activity->slug;
         else
             $activity_slug = __( 'activity', 'buddypress' );
 
-        if ( defined( 'BP_FORUMS_SLUG' ) && BP_FORUMS_SLUG )
-            $forums_slug = constant( 'BP_FORUMS_SLUG' );
+        // Forums
+        if ( isset( $bp->forums->slug ) )
+            $forums_slug = $bp->forums->slug;
         else
             $forums_slug = __( 'forums', 'buddypress' );
 
-        if ( defined( 'BP_BLOGS_SLUG' ) && BP_BLOGS_SLUG )
-            $blogs_slug = constant( 'BP_BLOGS_SLUG' );
+        // Blogs
+        if ( isset( $bp->blogs->slug ) )
+            $blogs_slug = $bp->blogs->slug;
         else
             $blogs_slug = __( 'blogs', 'buddypress' );
 
-        if ( defined( 'BP_REGISTER_SLUG' ) && BP_REGISTER_SLUG )
-            $register_slug = constant( 'BP_REGISTER_SLUG' );
+        // Register
+        if ( isset( $bp->register->slug ) )
+            $register_slug = $bp->register->slug;
         else
             $register_slug = __( 'register', 'buddypress' );
 
-        if ( defined( 'BP_ACTIVATION_SLUG' ) && BP_ACTIVATION_SLUG )
-            $activation_slug = constant( 'BP_ACTIVATION_SLUG' );
+        if ( isset( $bp->activation->slug ) )
+            $activation_slug = $bp->activation->slug;
         else
             $activation_slug = __( 'activate', 'buddypress' );
 
+        // What kind of setup is taking place
         if ( 'new' == $this->setup_type ) : ?>