Changeset 8812 for trunk/src/bp-core/bp-core-options.php

Timestamp:

08/12/2014 01:34:45 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Clean up to bp-core-options.php:

• Brackets
• Replace $bp global with buddypress()
• Use array_keys() to avoid creating $value variables

File:

• trunk/src/bp-core/bp-core-options.php (modified) (8 diffs)

trunk/src/bp-core/bp-core-options.php

@@ -150 +150 @@
 
     // Add default options
-    foreach ( $options as $key => $value )
+    foreach ( array_keys( $options ) as $key ) {
         delete_option( $key );
+    }
 
     // Allow previously activated plugins to append their own options.
@@ -174 +175 @@
 
     // Add filters to each BuddyPress option
-    foreach ( $options as $key => $value )
+    foreach ( array_keys( $options ) as $key ) {
         add_filter( 'pre_option_' . $key, 'bp_pre_get_option' );
+    }
 
     // Allow previously activated plugins to append their own options.
@@ -188 +190 @@
  * @since BuddyPress (1.6)
  *
- * @global BuddyPress $bp
  * @param bool $value Optional. Default value false
  * @return mixed false if not overloaded, mixed if set
  */
 function bp_pre_get_option( $value = false ) {
-    global $bp;
+    $bp = buddypress();
 
     // Get the name of the current filter so we can manipulate it
@@ -202 +203 @@
 
     // Check the options global for preset value
-    if ( !empty( $bp->options[$option] ) )
-        $value = $bp->options[$option];
+    if ( ! empty( $bp->options[ $option ] ) ) {
+        $value = $bp->options[ $option ];
+    }
 
     // Always return a value, even if false
@@ -383 +385 @@
             // Loop through options
             foreach ( $root_blog_options as $old_meta_key => $old_meta_default ) {
-                // Clear out the value from the last time around
-                unset( $old_meta_value );
 
                 if ( isset( $existing_options[$old_meta_key] ) ) {
@@ -391 +391 @@
 
                 // Get old site option
-                if ( is_multisite() )
+                if ( is_multisite() ) {
                     $old_meta_value = get_site_option( $old_meta_key );
+                }
 
                 // No site option so look in root blog
-                if ( empty( $old_meta_value ) )
+                if ( empty( $old_meta_value ) ) {
                     $old_meta_value = bp_get_option( $old_meta_key, $old_meta_default );
+                }
 
                 // Update the root blog option
@@ -403 +405 @@
                 // Update the global array
                 $root_blog_options_meta[$old_meta_key] = $old_meta_value;
+
+                // Clear out the value for the next time around
+                unset( $old_meta_value );
             }
 
@@ -411 +416 @@
         } else {
             // Loop through our results and make them usable
-            foreach ( $root_blog_options_meta as $root_blog_option )
+            foreach ( $root_blog_options_meta as $root_blog_option ) {
                 $root_blog_options[$root_blog_option->name] = $root_blog_option->value;
+            }
 
             // Copy the options no the return val