Changeset 3451

Timestamp:

08/25/2011 09:38:52 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Allow default options to be overloaded from within the $bbp->options array ala bbPress 1.x.

Location:

branches/plugin

Files:

• bbp-includes/bbp-core-hooks.php (modified) (1 diff)
• bbp-includes/bbp-core-options.php (modified) (4 diffs)
• bbpress.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-core-hooks.php

@@ -70 +70 @@
 add_action( 'bbp_init', 'bbp_register_shortcodes',    20  );
 add_action( 'bbp_init', 'bbp_add_rewrite_tags',       22  );
+add_action( 'bbp_init', 'bbp_add_option_filters',     24  );
 add_action( 'bbp_init', 'bbp_ready',                  999 );
 

branches/plugin/bbp-includes/bbp-core-options.php

@@ -140 +140 @@
  * This is non-destructive, so existing settings will not be overridden.
  *
+ * @uses bbp_get_default_options() To get default options
  * @uses add_option() Adds default options
  * @uses do_action() Calls 'bbp_add_options'
@@ -153 +154 @@
 
     // Allow previously activated plugins to append their own options.
-    // This is an extremely rare use-case.
     do_action( 'bbp_add_options' );
 }
@@ -162 +162 @@
  * This is destructive, so existing settings will be destroyed.
  *
+ * @uses bbp_get_default_options() To get default options
  * @uses delete_option() Removes default options
  * @uses do_action() Calls 'bbp_delete_options'
@@ -175 +176 @@
 
     // Allow previously activated plugins to append their own options.
-    // This is an extremely rare use-case.
     do_action( 'bbp_delete_options' );
+}
+
+/**
+ * Add filters to each bbPress option and allow them to be overloaded from
+ * inside the $bbp->options array.
+ * 
+ * @since bbPress (r3451)
+ *
+ * @uses bbp_get_default_options() To get default options
+ * @uses add_filter() To add filters to 'pre_option_{$key}'
+ * @uses do_action() Calls 'bbp_add_option_filters'
+ */
+function bbp_add_option_filters() {
+    
+    // Get the default options and values
+    $options = bbp_get_default_options();
+
+    // Add filters to each bbPress option
+    foreach ( $options as $key => $value )
+        add_filter( 'pre_option_' . $key, 'bbp_pre_get_option' );
+
+    // Allow previously activated plugins to append their own options.
+    do_action( 'bbp_add_option_filters' );
+}
+
+/**
+ * Filter default options and allow them to be overloaded from inside the
+ * $bbp->options array.
+ *
+ * @since bbPress (r3451)
+ *
+ * @global bbPress $bbp
+ * @param bool $value
+ * @return mixed false if not overloaded, mixed if set
+ */
+function bbp_pre_get_option( $value = false ) {
+    global $bbp;
+
+    // Get the name of the current filter so we can manipulate it
+    $filter = current_filter();
+
+    // Remove the filter prefix
+    $option = str_replace( 'pre_option_', '', $filter );
+
+    // Check the options global for preset value
+    if ( !empty( $bbp->options[$option] ) )
+        $value = $bbp->options[$option];
+
+    // Always return a value, even if false
+    return $value;
 }
 

branches/plugin/bbpress.php

@@ -275 +275 @@
      */
     public $extend = false;
+
+    /** Option Overload *******************************************************/
+
+    /**
+     * @var array Optional Overloads default options retrieved from get_option()
+     */
+    public $options = array();
 
     /** Functions *************************************************************/