|
@@ -474,9 +474,11 @@ |
|
|
block discarded – undo |
|
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
|
} |
Please login to merge, or discard this patch.