Changeset 3661

Timestamp:

01/05/2011 10:27:07 PM (14 years ago)

Author:

djpaul

Message:

Don't include wp-includes/registration.php if on WordPress 3.1. Fixes #2997

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-blogs/bp-blogs-templatetags.php (modified) (1 diff)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (1 diff)
• bp-core/bp-core-signup.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -547 +547 @@
 
     if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {
-        include_once( ABSPATH . WPINC . '/registration.php' );
+        bp_core_maybe_include_user_registration_file();
 
         foreach( (array)$usernames as $username ) {

trunk/bp-activity/bp-activity-filters.php

@@ -114 +114 @@
  */
 function bp_activity_at_name_filter( $content ) {
-    include_once( ABSPATH . WPINC . '/registration.php' );
+    bp_core_maybe_include_user_registration_file();
 
     $usernames = bp_activity_find_mentions( $content );

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -326 +326 @@
     global $bp;
 
-    require_once( ABSPATH . WPINC . '/registration.php' );
+    bp_core_maybe_include_user_registration_file();
 
     if ( isset($_POST['submit']) ) {

trunk/bp-core.php

@@ -283 +283 @@
 
     return apply_filters( 'bp_core_get_page_names', $pages );
+}
+
+/**
+ * If we're not on WordPress 3.1+, then include the file containing the user registration methods.
+ *
+ * @global float $wp_version WordPress version number
+ * @since 1.3
+ */
+function bp_core_maybe_include_user_registration_file() {
+    global $wp_version;
+
+    if ( $wp_version >= 3.1 )
+        return;
+
+    require_once( ABSPATH . WPINC . '/registration.php' );
 }
 

trunk/bp-core/bp-core-settings.php

@@ -52 +52 @@
         check_admin_referer('bp_settings_general');
 
-        require_once( ABSPATH . WPINC . '/registration.php' );
+        bp_core_maybe_include_user_registration_file();
 
         // Form has been submitted and nonce checks out, lets do it.

trunk/bp-core/bp-core-signup.php

@@ -36 +36 @@
         check_admin_referer( 'bp_new_signup' );
 
-        require_once( ABSPATH . WPINC . '/registration.php' );
+        bp_core_maybe_include_user_registration_file();
 
         /* Check the base account details for problems */
@@ -218 +218 @@
     if ( isset( $_GET['key'] ) ) {
 
-        require_once( ABSPATH . WPINC . '/registration.php' );
+        bp_core_maybe_include_user_registration_file();
 
         /* Activate the signup */