- $id_bin = Wikimedia\base_convert( $id, 10, 2 );
- $lastId_bin = Wikimedia\base_convert( $lastId, 10, 2 );
+ // Convert string to binary and pad to full length so we can
+ // extract segments
+ $id_bin = Wikimedia\base_convert( $id, 10, 2, $bits );
+ $lastId_bin = Wikimedia\base_convert( $lastId, 10, 2, $bits );
+
+ $timestamp_bin = substr( $id_bin, 0, $tbits );
+ $last_timestamp_bin = substr( $lastId_bin, 0, $tbits );