dropdown in append/prepend

Author: Erwane

src/View/Helper/FormHelper.php

@@ -308,17 +308,18 @@ protected function _getColumnClass($what) {
      */
     protected function _wrapInputGroup($addonOrButtons, $type) {
         if ($addonOrButtons) {
-            if (is_string($addonOrButtons)) {
+            if (is_array($addonOrButtons)) {
+                $addonOrButtons = implode('', $addonOrButtons);
+            } else {
                 $addonOrButtons = $this->_makeIcon($addonOrButtons);
-                if (!Matching::findTagOrAttribute(
-                        'button', ['type' => 'submit'], $addonOrButtons)) {
-                    $addonOrButtons = $this->formatTemplate('inputGroupText', [
-                        'content' => $addonOrButtons
-                    ]);
-                }
             }
-            else {
-                $addonOrButtons = implode('', $addonOrButtons);
+
+            $isButton = strpos($addonOrButtons, '<button') === 0;
+            $isDropdown = strpos($addonOrButtons, 'data-toggle="dropdown"');
+            if (!$isButton && !$isDropdown) {
+                $addonOrButtons = $this->formatTemplate('inputGroupText', [
+                    'content' => $addonOrButtons
+                ]);
             }
 
             $addonOrButtons = $this->formatTemplate('inputGroupAddons', [
@@ -713,7 +714,10 @@ public function dropdownButton($title, array $menu = [], array $options = []) {
 
         $options = $this->addClass($options, 'dropdown-toggle');
 
-        return $this->button($title, $options) . $this->Html->dropdown($menu, $ulOptions);
+        return $this->buttonGroup([
+            $this->button($title, $options),
+            $this->Html->dropdown($menu, $ulOptions)
+        ], $bGroupOptions);
     }
 
     /**