Changeset 6419 for trunk/src/includes/core/options.php

Timestamp:

05/19/2017 04:52:16 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Settings: General improvements:

• Use escaped equivalent for gettext output
• Update settings-integration away from bool to allow future flexibility
• Stash settings fields in a static variable to speed up registration

File:

• trunk/src/includes/core/options.php (modified) (3 diffs)

trunk/src/includes/core/options.php

@@ -48 +48 @@
                 '_bbp_theme_package_id'       => 'default',                  // The ID for the current theme package
                 '_bbp_default_role'           => bbp_get_participant_role(), // Default forums role
-                '_bbp_settings_integration'   => 0,                          // Put settings into existing admin pages
+                '_bbp_settings_integration'   => 'basic',                    // How to integrate into wp-admin
 
                 /** Per Page **********************************************************/
@@ -479 +479 @@
  * Integrate settings into existing WordPress pages
  *
+ * There are 3 possible modes:
+ * - 'basic'   Traditional admin integration
+ * - 'compact' One "bbPress" top-level admin menu
+ * - 'deep'    Deeply integrate with the WordPress admin interface
+ *
  * @since 2.4.0 bbPress (r4932)
  *
@@ -485 +490 @@
  * @return bool To deeply integrate settings, or not
  */
-function bbp_settings_integration( $default = 0 ) {
-        return (bool) apply_filters( 'bbp_settings_integration', (bool) get_option( '_bbp_settings_integration', $default ) );
+function bbp_settings_integration( $default = 'basic' ) {
+
+        // Get the option value
+        $integration = get_option( '_bbp_settings_integration', $default );
+
+        // Back-compat for deep/basic (pre-2.6)
+        if ( is_numeric( $integration ) ) {
+                $integration = ( 1 === (int) $integration )
+                        ? 'deep'
+                        : 'basic';
+        }
+
+        // Fallback to 'none' if invalid
+        if ( ! in_array( $integration, array( 'basic', 'deep', 'compact' ), true ) ) {
+                $integration = 'basic';
+        }
+
+        // Filter & return
+        return apply_filters( 'bbp_settings_integration', $integration, $default );
 }