Changeset 4088 for trunk/bp-members/bp-members-template.php

Timestamp:

03/08/2011 06:35:03 AM (15 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-members/bp-members-template.php (modified) (4 diffs)

trunk/bp-members/bp-members-template.php

@@ -1 +1 @@
 <?php
+
+/**
+ * BuddyPress Member Template Tags
+ *
+ * Functions that are safe to use inside your template files and themes
+ *
+ * @package BuddyPress
+ * @subpackage Members
+ */
 
 /**
@@ -47 +56 @@
                 global $bp;
                 return apply_filters( 'bp_get_members_root_slug', $bp->members->root_slug );
+        }
+
+/**
+ * Output the sign-up slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_members_slug()
+ */
+function bp_signup_slug() {
+        echo bp_get_signup_slug();
+}
+        /**
+         * Return the sign-up slug
+         *
+         * @package BuddyPress
+         * @subpackage Members Template
+         * @since BuddyPress {unknown}
+         */
+        function bp_get_signup_slug() {
+                global $bp;
+
+                if ( !empty( $bp->pages->register->slug ) )
+                        $slug = $bp->pages->register->slug;
+                elseif ( defined( 'BP_REGISTER_SLUG' ) )
+                        $slug = BP_REGISTER_SLUG;
+                else
+                        $slug = 'register';
+
+                return apply_filters( 'bp_get_signup_slug', $bp->pages->register->slug );
+        }
+
+/**
+ * Output the activation slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_members_slug()
+ */
+function bp_activate_slug() {
+        echo bp_get_activate_slug();
+}
+        /**
+         * Return the activation slug
+         *
+         * @package BuddyPress
+         * @subpackage Members Template
+         * @since BuddyPress {unknown}
+         */
+        function bp_get_activate_slug() {
+                global $bp;
+
+                if ( !empty( $bp->pages->activate->slug ) )
+                        $slug = $bp->pages->activate->slug;
+                elseif ( defined( 'BP_ACTIVATION_SLUG' ) )
+                        $slug = BP_ACTIVATION_SLUG;
+                else
+                        $slug = 'activate';
+
+                return apply_filters( 'bp_get_activate_slug', $bp->pages->activate->slug );
         }
 
@@ -802 +875 @@
 
                 if ( bp_has_custom_signup_page() )
-                        $page = bp_get_root_domain() . '/' . BP_REGISTER_SLUG;
+                        $page = trailingslashit( bp_get_root_domain() . '/' . $bp->pages->register->slug );
                 else
                         $page = bp_get_root_domain() . '/wp-signup.php';
@@ -823 +896 @@
 
                 if ( bp_has_custom_activation_page() )
-                        $page = trailingslashit( bp_get_root_domain() ) . BP_ACTIVATION_SLUG;
+                        $page = trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug );
                 else
                         $page = trailingslashit( bp_get_root_domain() ) . 'wp-activate.php';