Changeset 6419 for trunk/src/includes/admin/admin.php

Timestamp:

05/19/2017 04:52:16 PM (7 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/admin/admin.php (modified) (4 diffs)

trunk/src/includes/admin/admin.php

@@ -181 +181 @@
         add_filter( 'bbp_map_meta_caps',   array( $this, 'map_settings_meta_caps' ), 10, 4 );
 
-        // Hide the theme compat package selection
-        add_filter( 'bbp_admin_get_settings_sections', array( $this, 'hide_theme_compat_packages' ) );
-
         // Allow keymasters to save forums settings
         add_filter( 'option_page_capability_bbpress',  array( $this, 'option_page_capability_bbpress' ) );
@@ -247 +244 @@
 
         // Are settings enabled?
-        if ( ! bbp_settings_integration() ) {
+        if ( 'basic' === bbp_settings_integration() ) {
             add_options_page(
                 __( 'Forums',  'bbpress' ),
@@ -369 +366 @@
 
             // Toggle the section if core integration is on
-            if ( ( true === $settings_integration ) && ! empty( $section['page'] ) ) {
+            if ( ( 'deep' === $settings_integration ) && ! empty( $section['page'] ) ) {
                 $page = $section['page'];
             } else {
@@ -668 +665 @@
             array( 'base' => '#f1f3f2', 'focus' => '#fff', 'current' => '#fff' )
         );
-    }
-
-    /**
-     * Hide theme compat package selection if only 1 package is registered
-     *
-     * @since 2.2.0 bbPress (r4315)
-     *
-     * @param array $sections Forums settings sections
-     * @return array
-     */
-    public function hide_theme_compat_packages( $sections = array() ) {
-        if ( count( bbpress()->theme_compat->packages ) <= 1 ) {
-            unset( $sections['bbp_settings_theme_compat'] );
-        }
-
-        return $sections;
     }