Changeset 3666
- Timestamp:
- 01/06/2011 03:17:09 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity.php
r3661 r3666 547 547 548 548 if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) { 549 bp_core_maybe_include_user_registration_file(); 549 if ( ! function_exists( 'username_exists' ) ) 550 require_once( ABSPATH . WPINC . '/registration.php' ); 550 551 551 552 foreach( (array)$usernames as $username ) { -
trunk/bp-activity/bp-activity-filters.php
r3661 r3666 114 114 */ 115 115 function bp_activity_at_name_filter( $content ) { 116 bp_core_maybe_include_user_registration_file(); 116 if ( ! function_exists( 'username_exists' ) ) 117 require_once( ABSPATH . WPINC . '/registration.php' ); 117 118 118 119 $usernames = bp_activity_find_mentions( $content ); -
trunk/bp-blogs/bp-blogs-templatetags.php
r3661 r3666 325 325 global $current_user, $current_site; 326 326 global $bp; 327 328 bp_core_maybe_include_user_registration_file();329 327 330 328 if ( isset($_POST['submit']) ) { -
trunk/bp-core.php
r3661 r3666 283 283 284 284 return apply_filters( 'bp_core_get_page_names', $pages ); 285 }286 287 /**288 * If we're not on WordPress 3.1+, then include the file containing the user registration methods.289 *290 * @global float $wp_version WordPress version number291 * @since 1.3292 */293 function bp_core_maybe_include_user_registration_file() {294 global $wp_version;295 296 if ( $wp_version >= 3.1 )297 return;298 299 require_once( ABSPATH . WPINC . '/registration.php' );300 285 } 301 286 -
trunk/bp-core/bp-core-settings.php
r3661 r3666 52 52 check_admin_referer('bp_settings_general'); 53 53 54 bp_core_maybe_include_user_registration_file(); 54 if ( ! function_exists( 'email_exists' ) ) 55 require_once( ABSPATH . WPINC . '/registration.php' ); 55 56 56 57 // Form has been submitted and nonce checks out, lets do it. -
trunk/bp-core/bp-core-signup.php
r3661 r3666 35 35 /* Check the nonce */ 36 36 check_admin_referer( 'bp_new_signup' ); 37 38 bp_core_maybe_include_user_registration_file();39 37 40 38 /* Check the base account details for problems */ … … 217 215 /* Check if an activation key has been passed */ 218 216 if ( isset( $_GET['key'] ) ) { 219 220 bp_core_maybe_include_user_registration_file();221 217 222 218 /* Activate the signup */ … … 353 349 global $wpdb; 354 350 351 if ( ! function_exists( 'validate_username' ) ) 352 require_once( ABSPATH . WPINC . '/registration.php' ); 353 355 354 $errors = new WP_Error(); 356 355 $user_email = sanitize_email( $user_email ); … … 430 429 } else { 431 430 $errors = new WP_Error(); 431 432 if ( ! function_exists( 'wp_insert_user' ) ) 433 require_once( ABSPATH . WPINC . '/registration.php' ); 432 434 433 435 $user_id = wp_insert_user( array( … … 537 539 } 538 540 539 /* Update the user_url and display_name */ 541 // Update the user_url and display_name 542 // Support for WP < 3.1 543 if ( ! function_exists( 'wp_update_user' ) ) 544 require_once( ABSPATH . WPINC . '/registration.php' ); 545 540 546 wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_core_get_user_domain( $user_id ), 'display_name' => bp_core_get_user_displayname( $user_id ) ) ); 541 547 -
trunk/bp-core/bp-core-templatetags.php
r3651 r3666 1279 1279 extract( $r, EXTR_SKIP ); 1280 1280 1281 $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir; 1281 if ( !empty( $_POST['signup_avatar_dir'] ) ) { 1282 $signup_avatar_dir = $_POST['signup_avatar_dir']; 1283 } else if ( !empty( $bp->signup->avatar_dir ) ) { 1284 $signup_avatar_dir = $bp->signup->avatar_dir; 1285 } 1282 1286 1283 1287 if ( empty( $signup_avatar_dir ) ) {
Note: See TracChangeset
for help on using the changeset viewer.