Changeset 11187 for trunk/src/bp-core/classes/class-bp-button.php

Timestamp:

10/12/2016 12:40:12 AM (10 years ago)

Author:

r-a-y

Message:

Core: Fix backward compatibility for BP_Button class.

• Set the $wrapper property default back to 'div' as before (​https://buddypress.trac.wordpress.org/browser/tags/2.6.2/src/bp-core/classes/class-bp-button.php?marks=87#L82) and set the $parent_element property as an empty string as a result.
• For backward compatiblity, check if property is empty before attempting to override mapped property.

See ​https://buddypress.trac.wordpress.org/ticket/7226#comment:43

Props needle, hnla.

Fixes #7226.

File:

• trunk/src/bp-core/classes/class-bp-button.php (modified) (3 diffs)

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

@@ -95 +95 @@
          * @var string Default: 'div'.
          */
-        public $parent_element = 'div';
+        public $parent_element = '';
 
         /**
@@ -154 +154 @@
          * @var string|bool
          */
-        public $wrapper = '';
+        public $wrapper = 'div';
 
         /**
@@ -386 +386 @@
 
                         // Set element.
-                        if ( false === $child ) {
+                        if ( false === $child && empty( $r[ "{$parent}_element" ] ) ) {
                                 $r[ "{$parent}_element" ] = $r[ $prop ];