Changeset 6448

Timestamp:

10/22/2012 08:00:13 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Activate and Sign-up:

• Resurrect bp_has_custom_activation_page() from 1.6 deprecation.
• Use bp_has_custom_activation_page() similarly to bp_has_custom_signup_page().
• Use static variable to prevent repeating logic multiple times per page load.
• Add phpdoc blocks.
• Use bp_locate_template() in bp_has_custom_activation_page() and bp_has_custom_signup_page() to more easily find whether a file exists in the correct location to provide template output.

Location:

trunk

Files:

• bp-core/deprecated/1.6.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (3 diffs)

trunk/bp-core/deprecated/1.6.php

@@ -80 +80 @@
 function bp_core_add_ajax_hook() {
     _deprecated_function( __FUNCTION__, '1.6', 'No longer used' );
-}
-
-/**
- * Members functions
- */
-
-/**
- * @deprecated 1.6
- * @deprecated No longer used. Check for $bp->pages->activate->slug instead.
- */
-function bp_has_custom_activation_page() {
-    _deprecated_function( __FUNCTION__, '1.6' );
 }
 

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

@@ -108 +108 @@
      */
     function bp_get_signup_slug() {
-        global $bp;
+        $bp = buddypress();
 
         if ( !empty( $bp->pages->register->slug ) )
@@ -967 +967 @@
 /** Signup Form ***************************************************************/
 
+/**
+ * Do we have a working custom sign up page?
+ *
+ * @since BuddyPress (1.5)
+ *
+ * @uses bp_get_signup_slug() To make sure there is a slug assigned to the page
+ * @uses bp_locate_template() To make sure a template exists to provide output
+ * @return boolean True if page and template exist, false if not
+ */
 function bp_has_custom_signup_page() {
-    // if theme is not bp-default, theme compat is on
-    // theme compat already bundles its own templates
-    if ( ! bp_is_theme_bp_default() )
-        return true;
-
-    // look in parent / child theme for custom registration templates
-    if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
-        return true;
-
-    return false;
+    static $has_page = false;
+
+    if ( empty( $has_page ) )
+        $has_page = bp_get_signup_slug() && bp_locate_template( array( 'registration/register.php', 'members/register.php', 'register.php' ), false );
+
+    return (bool) $has_page;
 }
 
@@ -1001 +1006 @@
     }
 
+/**
+ * Do we have a working custom activation page?
+ *
+ * @since BuddyPress (1.5)
+ *
+ * @uses bp_get_activate_slug() To make sure there is a slug assigned to the page
+ * @uses bp_locate_template() To make sure a template exists to provide output
+ * @return boolean True if page and template exist, false if not
+ */
+function bp_has_custom_activation_page() {
+    static $has_page = false;
+    
+    if ( empty( $has_page ) )
+        $has_page = bp_get_activate_slug() && bp_locate_template( array( 'registration/activate.php', 'members/activate.php', 'activate.php' ), false );
+
+    return (bool) $has_page;
+}
+
 function bp_activation_page() {
     echo bp_get_activation_page();
 }
     function bp_get_activation_page() {
-        global $bp;
-
-        // Check the global directly to make sure the WP page exists in $bp->pages
-        if ( !empty( $bp->pages->activate->slug ) )
-            $page = trailingslashit( bp_get_root_domain() . '/' . $bp->pages->activate->slug );
-        else
+        if ( bp_has_custom_activation_page() ) {
+            $page = trailingslashit( bp_get_root_domain() . '/' . bp_get_activate_slug() );
+        } else {
             $page = trailingslashit( bp_get_root_domain() ) . 'wp-activate.php';
+        }
 
         return apply_filters( 'bp_get_activation_page', $page );