Merge branch '1.0' into 2.0

This commit is contained in:
terrafrost 2021-05-23 10:38:31 -05:00
commit 333d2f9ffd

View File

@ -5058,7 +5058,7 @@ class X509
$temp = $str;
} else {
$temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
$temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $str, 1);
$temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $temp, 1);
}
// remove new lines
$temp = str_replace(array("\r", "\n", ' '), '', $temp);