Changeset 5727 for trunk/bp-members/bp-members-functions.php

Timestamp:

02/11/2012 09:19:15 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Use bp_get_option() in more places, and include bp-core-options.php in update wizard.

File:

• trunk/bp-members/bp-members-functions.php (modified) (2 diffs)

trunk/bp-members/bp-members-functions.php

@@ -930 +930 @@
 
         if ( empty( $user_id ) ) {
-            $errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'buddypress' ), get_option( 'admin_email' ) ) );
+            $errors->add( 'registerfail', sprintf( __('<strong>ERROR</strong>: Couldn&#8217;t register you... please contact the <a href="mailto:%s">webmaster</a> !', 'buddypress' ), bp_get_option( 'admin_email' ) ) );
             return $errors;
         }
@@ -1109 +1109 @@
     $activate_url = esc_url( $activate_url );
 
-    $from_name = ( '' == get_option( 'blogname' ) ) ? __( 'BuddyPress', 'buddypress' ) : esc_html( get_option( 'blogname' ) );
+    $from_name = ( '' == bp_get_option( 'blogname' ) ) ? __( 'BuddyPress', 'buddypress' ) : esc_html( bp_get_option( 'blogname' ) );
 
     $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );