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

Timestamp:

03/08/2011 06:35:03 AM (16 years ago)

Author:

johnjamesjacoby

Message:

More auditing of _slug and _root_slug functions.

Introduce functions for updating '$bp->is_' globals to prevent loading $bp global in several functions.

Various phpDoc fixes and whitespace clean-up. (1.3 trunk)

File:

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

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

@@ -332 +332 @@
 
                 // Check for defined slugs
-                if ( isset( $bp->members->slug ) )
+                if ( !empty( $bp->members->slug ) )
                         $members_slug = $bp->members->slug;
                 else
-                        $members_slug = __( 'Members', 'buddypress' );
+                        $members_slug = __( 'members', 'buddypress' );
 
                 // Groups
-                if ( isset( $bp->groups->slug ) )
-                        $groups_slug = constant( 'BP_GROUPS_SLUG' );
+                if ( !empty( $bp->groups->slug ) )
+                        $groups_slug = $bp->groups->slug;
                 else
-                        $groups_slug = __( 'Groups', 'buddypress' );
+                        $groups_slug = __( 'groups', 'buddypress' );
 
                 // Activity
-                if ( isset( $bp->activity->slug ) )
+                if ( !empty( $bp->activity->slug ) )
                         $activity_slug = $bp->activity->slug;
                 else
@@ -350 +350 @@
 
                 // Forums
-                if ( isset( $bp->forums->slug ) )
+                if ( !empty( $bp->forums->slug ) )
                         $forums_slug = $bp->forums->slug;
                 else
@@ -356 +356 @@
 
                 // Blogs
-                if ( isset( $bp->blogs->slug ) )
+                if ( !empty( $bp->blogs->slug ) )
                         $blogs_slug = $bp->blogs->slug;
                 else
@@ -362 +362 @@
 
                 // Register
-                if ( isset( $bp->register->slug ) )
+                if ( !empty( $bp->register->slug ) )
                         $register_slug = $bp->register->slug;
                 else
                         $register_slug = __( 'register', 'buddypress' );
 
-                if ( isset( $bp->activation->slug ) )
+                if ( !empty( $bp->activation->slug ) )
                         $activation_slug = $bp->activation->slug;
                 else