Ticket #7226: 7226.needle.02.patch

src/bp-core/classes/class-bp-button.php

@@ -94 +94 @@
          *
          * @var string Default: 'div'.
          */
-        public $parent_element = 'div';
+        public $parent_element = '';
 
         /**
          * Element attributes for parent element.
@@ -153 +153 @@
          *
          * @var string|bool
          */
-        public $wrapper = '';
+        public $wrapper = 'div';
 
         /**
          * The DOM class of the button wrapper.
@@ -385 +385 @@
                         }
 
                         // Set element.
-                        if ( false === $child ) {
+                        if ( false === $child && empty( $r[ "{$parent}_element" ] ) ) {
                                 $r[ "{$parent}_element" ] = $r[ $prop ];
 
                         // Set attributes.