diff --git a/application/admin/common.php b/application/admin/common.php
index 2622b4ac..f3d1e991 100755
--- a/application/admin/common.php
+++ b/application/admin/common.php
@@ -39,7 +39,7 @@ if (!function_exists('build_radios')) {
$selected = is_null($selected) ? key($list) : $selected;
$selected = is_array($selected) ? $selected : explode(',', $selected);
foreach ($list as $k => $v) {
- $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::radio($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
+ $html[] = sprintf(Form::label("{$name}-{$k}", "%s " . str_replace('%', '%%', $v)), Form::radio($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
}
return '
' . implode(' ', $html) . '
';
}
@@ -60,7 +60,7 @@ if (!function_exists('build_checkboxs')) {
$selected = is_null($selected) ? [] : $selected;
$selected = is_array($selected) ? $selected : explode(',', $selected);
foreach ($list as $k => $v) {
- $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::checkbox($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
+ $html[] = sprintf(Form::label("{$name}-{$k}", "%s " . str_replace('%', '%%', $v)), Form::checkbox($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
}
return '' . implode(' ', $html) . '
';
}
diff --git a/extend/fast/Form.php b/extend/fast/Form.php
index 173b7380..e1041a17 100644
--- a/extend/fast/Form.php
+++ b/extend/fast/Form.php
@@ -870,7 +870,7 @@ EOD;
$checked = is_array($checked) ? $checked : explode(',', $checked);
foreach ($list as $k => $v) {
$options['id'] = "{$name}-{$k}";
- $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::checkbox("{$name}[{$k}]", $k, in_array($k, $checked), $options));
+ $html[] = sprintf(Form::label("{$name}-{$k}", "%s " . str_replace('%', '%%', $v)), Form::checkbox("{$name}[{$k}]", $k, in_array($k, $checked), $options));
}
return '' . implode(' ', $html) . '
';
}
@@ -913,7 +913,7 @@ EOD;
$checked = is_array($checked) ? $checked : explode(',', $checked);
foreach ($list as $k => $v) {
$options['id'] = "{$name}-{$k}";
- $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::radio($name, $k, in_array($k, $checked), $options));
+ $html[] = sprintf(Form::label("{$name}-{$k}", "%s " . str_replace('%', '%%', $v)), Form::radio($name, $k, in_array($k, $checked), $options));
}
return '' . implode(' ', $html) . '
';
}
@@ -1002,8 +1002,8 @@ EOD;
{
$domname = str_replace(['[', ']', '.'], '', $name);
$options = [
- 'id' => "plupload-{$domname}",
- 'class' => "btn btn-danger plupload",
+ 'id' => "faupload-{$domname}",
+ 'class' => "btn btn-danger faupload",
'data-input-id' => "c-{$domname}",
];
$upload = $uploadAttr === false ? false : true;
@@ -1023,7 +1023,7 @@ EOD;
}
$chooseBtn = $choose ? $this->button(' ' . __('Choose'), array_merge($options, $chooseAttr)) : '';
$previewAttrHtml = $this->attributes($previewAttr);
- $previewArea = $preview ? '' : '';
+ $previewArea = $preview ? '' : '';
$input = $this->text($name, $value, array_merge(['size' => 50, 'id' => "c-{$domname}"], $inputAttr));
$html = <<