不要なタグ属性削除

Author: s-nakajima

View/Helper/LinkButtonHelper.php

@@ -74,7 +74,7 @@ public function add($title = '', $url = null, $options = array()) {
 		unset($inputOptions['icon']);
 		//ボタンサイズ
 		if ($inputOptions['iconSize']) {
-			$inputOptions['class'] .= ' ' . h($inputOptions['iconSize']);
+			$inputOptions['class'] .= ' ' . trim(h($inputOptions['iconSize']));
 		}
 		unset($inputOptions['iconSize']);
 
@@ -123,7 +123,9 @@ public function edit($title = '', $url = null, $options = array()) {
 		unset($inputOptions['icon']);
 
 		//ボタンサイズ
-		$inputOptions['class'] .= ' ' . h($inputOptions['iconSize']);
+		if ($inputOptions['iconSize']) {
+			$inputOptions['class'] .= ' ' . trim(h($inputOptions['iconSize']));
+		}
 		unset($inputOptions['iconSize']);
 
 		//span tooltipタグの出力
@@ -171,7 +173,9 @@ public function search($title = '', $url = null, $options = array()) {
 		unset($inputOptions['icon']);
 
 		//ボタンサイズ
-		$inputOptions['class'] .= ' ' . h($inputOptions['iconSize']);
+		if ($inputOptions['iconSize']) {
+			$inputOptions['class'] .= ' ' . trim(h($inputOptions['iconSize']));
+		}
 		unset($inputOptions['iconSize']);
 
 		//span tooltipタグの出力
@@ -227,7 +231,9 @@ public function sort($title = '', $url = null, $options = array()) {
 		unset($inputOptions['icon']);
 
 		//ボタンサイズ
-		$inputOptions['class'] .= ' ' . h($inputOptions['iconSize']);
+		if ($inputOptions['iconSize']) {
+			$inputOptions['class'] .= ' ' . trim(h($inputOptions['iconSize']));
+		}
 		unset($inputOptions['iconSize']);
 
 		//span tooltipタグの出力

View/Helper/NetCommonsFormHelper.php

@@ -241,6 +241,9 @@ public function radio($fieldName, $options = array(), $attributes = array()) {
 
 		$input = '';
 
+		$outer = Hash::get($attributes, 'outer');
+		$attributes = Hash::remove($attributes, 'outer');
+
 		$befor = Hash::get($attributes, 'before', '');
 		$separator = Hash::get($attributes, 'separator', '');
 		$after = Hash::get($attributes, 'after', '');
@@ -260,7 +263,7 @@ public function radio($fieldName, $options = array(), $attributes = array()) {
 		}
 
 		$output = '';
-		if (Hash::get($attributes, 'outer')) {
+		if ($outer) {
 			$output .= '<div class="form-input-outer">';
 			$output .= $input;
 			$output .= '</div>';
@@ -356,6 +359,10 @@ protected function _multipleCheckbox($fieldName, $options = array()) {
 		$hiddenField = true;
 		$input = '';
 		$divOption = Hash::get($options, 'div');
+
+		$outer = Hash::get($options, 'outer');
+		$options = Hash::remove($options, 'outer');
+
 		foreach ($options['options'] as $key => $value) {
 			$inputOptions = array(
 				'type' => 'select',
@@ -373,7 +380,7 @@ protected function _multipleCheckbox($fieldName, $options = array()) {
 			$input = $this->Html->div(null, $input, $divOption);
 		}
 
-		if (Hash::get($options, 'outer')) {
+		if ($outer) {
 			$output .= '<div class="form-input-outer">';
 			$output .= $input;
 			$output .= '</div>';