Changeset 5727

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.

Location:

trunk

Files:

• bp-core/admin/bp-core-settings.php (modified) (2 diffs)
• bp-core/admin/bp-core-update.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (2 diffs)
• bp-loader.php (modified) (1 diff)
• bp-members/bp-members-functions.php (modified) (2 diffs)
• bp-members/bp-members-template.php (modified) (1 diff)

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

@@ -296 +296 @@
      * @since BuddyPress (r3203)
      *
-     * @uses get_option()
+     * @uses bp_get_option()
      * @uses esc_attr()
      * @uses apply_filters()
@@ -307 +307 @@
 
         // Get the option and sanitize it
-        $value = get_option( $option, $default );
+        $value = bp_get_option( $option, $default );
 
         // Slug?

trunk/bp-core/admin/bp-core-update.php

@@ -500 +500 @@
 
         $prefix              = '';
-        $permalink_structure = get_option( 'permalink_structure' );
+        $permalink_structure = bp_get_option( 'permalink_structure' );
         $structures          = array( '', $prefix . '/%year%/%monthnum%/%day%/%postname%/', $prefix . '/%year%/%monthnum%/%postname%/', $prefix . '/archives/%post_id%' );
 

trunk/bp-groups/bp-groups-notifications.php

@@ -67 +67 @@
 
     $ud             = bp_core_get_core_userdata( $admin_id );
-    $requesting_ud  = bp_core_get_core_userdata( $requesting_user_id );
     $group_requests = bp_get_group_permalink( $group ) . 'admin/membership-requests';
     $profile_link   = bp_core_get_user_domain( $requesting_user_id );
@@ -75 +74 @@
     // Set up and send the message
     $to       = $ud->user_email;
-    $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+    $sitename = wp_specialchars_decode( bp_get_option( 'blogname' ), ENT_QUOTES );
     $subject  = '[' . $sitename . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
 

trunk/bp-loader.php

@@ -478 +478 @@
                 require( $this->plugin_dir . 'bp-core/bp-core-update.php'       );
                 require( $this->plugin_dir . 'bp-core/bp-core-caps.php'         );
+                require( $this->plugin_dir . 'bp-core/bp-core-options.php'      );
                 require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
             }

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 );

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

@@ -1141 +1141 @@
 
         if ( is_multisite() ) {
-            if ( in_array( $bp->site_options['registration'], array( 'all', 'user' ) ) )
+            if ( in_array( $bp->site_options['registration'], array( 'all', 'user' ) ) ) {
                 $signup_allowed = true;
+            }
 
         } else {
-            if ( get_option( 'users_can_register') )
+            if ( bp_get_option( 'users_can_register') ) {
                 $signup_allowed = true;
+            }
         }