Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2019-03-09 18:42:54 -06:00
commit 529fcae7f6

View File

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