@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Yii; |
| 6 | 6 | use yii\helpers\FileHelper; |
| 7 | - |
|
| 8 | 7 | use yii\imagine\Image; |
| 9 | 8 | |
| 10 | 9 | /** |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace luya\web; |
| 4 | 4 | |
| 5 | 5 | use Yii; |
| 6 | - |
|
| 7 | 6 | use yii\web\BadRequestHttpException; |
| 8 | 7 | |
| 9 | 8 | /** |
@@ -474,9 +474,11 @@ |
||
| 474 | 474 | $style = @json_decode($style_json_string, $as_assoc = true); |
| 475 | 475 | |
| 476 | 476 | $style_indexes[$i] = array('num_fmt_idx' => $number_format_idx);//initialize entry |
| 477 | - if (isset($style['border']) && is_string($style['border']))//border is a comma delimited str |
|
| 477 | + if (isset($style['border']) && is_string($style['border'])) { |
|
| 478 | + //border is a comma delimited str |
|
| 478 | 479 | { |
| 479 | 480 | $border_value['side'] = array_intersect(explode(",", $style['border']), $border_allowed); |
| 481 | + } |
|
| 480 | 482 | if (isset($style['border-style']) && in_array($style['border-style'], $border_style_allowed)) { |
| 481 | 483 | $border_value['style'] = $style['border-style']; |
| 482 | 484 | } |