Skip to content

Commit 70de56d

Browse files
committed
Merge branch '3.3.x'
2 parents 50d25b7 + e3614fb commit 70de56d

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

phpBB/includes/functions_convert.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ function make_uid($timestamp)
223223

224224
if (empty($last_timestamp) || $timestamp != $last_timestamp)
225225
{
226-
$last_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN);
226+
$unique_id = preg_replace('/[^0-9a-f]/', '', unique_id());
227+
$last_uid = substr(base_convert($unique_id, 16, 36), 0, BBCODE_UID_LEN);
227228
}
228229
$last_timestamp = $timestamp;
229230
return $last_uid;

0 commit comments

Comments
 (0)