Merge branch '2.0'

This commit is contained in:
terrafrost 2019-03-09 18:43:35 -06:00
commit 09fdd60931

View File

@ -1900,7 +1900,7 @@ class X509
} }
$output.= $desc . '=' . $value; $output.= $desc . '=' . $value;
$result[$desc] = isset($result[$desc]) ? $result[$desc] = isset($result[$desc]) ?
array_merge((array) $dn[$prop], [$value]) : array_merge((array) $result[$desc], [$value]) :
$value; $value;
$start = false; $start = false;
} }