Changeset 12050 for trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

Timestamp:

05/03/2018 06:01:39 PM (8 years ago)

Author:

boonebgorges

Message:

Nouveau: Fix the 'tabbed style' feature for primary item nav.

Fixes #7801.

File:

• trunk/src/bp-templates/bp-nouveau/includes/template-tags.php (modified) (3 diffs)

trunk/src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -1515 +1515 @@
         // this is a temp workaround but differs from earlier dir approach- bad!
         if ( bp_is_group() ) {
-            $nav_tabs = bp_nouveau_get_temporary_setting( 'group_nav_tabs', bp_nouveau_get_appearance_settings( 'group_nav_tabs' ) );
+            $nav_tabs = (int) bp_nouveau_get_temporary_setting( 'group_nav_tabs', bp_nouveau_get_appearance_settings( 'group_nav_tabs' ) );
 
         } elseif ( bp_is_user() ) {
-            $nav_tabs = bp_nouveau_get_temporary_setting( 'user_nav_tabs', bp_nouveau_get_appearance_settings( 'user_nav_tabs' ) );
+            $nav_tabs = (int) bp_nouveau_get_temporary_setting( 'user_nav_tabs', bp_nouveau_get_appearance_settings( 'user_nav_tabs' ) );
         }
 
         if ( bp_is_group() && 1 === $nav_tabs) {
             $classes[] = 'group-nav-tabs';
+            $classes[] = 'tabbed-links';
         } elseif ( bp_is_user() && 1 === $nav_tabs ) {
             $classes[] = 'user-nav-tabs';
+            $classes[] = 'tabbed-links';
         }
 
@@ -1599 +1601 @@
 
         $customizer_option = ( bp_is_user() )? 'user_subnav_tabs' : 'group_subnav_tabs';
-        $nav_tabs = bp_nouveau_get_temporary_setting( $customizer_option, bp_nouveau_get_appearance_settings( $customizer_option ) );
+        $nav_tabs = (int) bp_nouveau_get_temporary_setting( $customizer_option, bp_nouveau_get_appearance_settings( $customizer_option ) );
 
         if ( bp_is_user() && 1 === $nav_tabs ) {
@@ -1644 +1646 @@
     function bp_nouveau_get_group_create_steps_classes() {
         $classes  = array( 'bp-navs', 'group-create-links', 'no-ajax' );
-        $nav_tabs = bp_nouveau_get_temporary_setting( 'groups_create_tabs', bp_nouveau_get_appearance_settings( 'groups_create_tabs' ) );
+        $nav_tabs = (int) bp_nouveau_get_temporary_setting( 'groups_create_tabs', bp_nouveau_get_appearance_settings( 'groups_create_tabs' ) );
 
         if ( 1 === $nav_tabs ) {