diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp index 5f20ab2ab6..2f67c61146 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/AbstractOperations.cpp @@ -1262,13 +1262,7 @@ ThrowCompletionOr parse_temporal_calendar_string(GlobalObject& global_ob return "iso8601"sv; } - // 5. If ! IsBuiltinCalendar(id) is false, then - if (!is_builtin_calendar(*id_part)) { - // a. Throw a RangeError exception. - return vm.throw_completion(global_object, ErrorType::TemporalInvalidCalendarIdentifier, *id_part); - } - - // 6. Return id. + // 5. Return id. return id_part.value(); } diff --git a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp index 6d61d702a6..0745f86a00 100644 --- a/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp +++ b/Userland/Libraries/LibJS/Runtime/Temporal/Calendar.cpp @@ -407,8 +407,12 @@ ThrowCompletionOr to_temporal_calendar(GlobalObject& global_object, Val // 3. If ! IsBuiltinCalendar(identifier) is false, then if (!is_builtin_calendar(identifier)) { - // a. Let identifier be ? ParseTemporalCalendarString(identifier). + // a. Set identifier to ? ParseTemporalCalendarString(identifier). identifier = TRY(parse_temporal_calendar_string(global_object, identifier)); + + // b. If ! IsBuiltinCalendar(identifier) is false, throw a RangeError exception. + if (!is_builtin_calendar(identifier)) + return vm.throw_completion(global_object, ErrorType::TemporalInvalidCalendarIdentifier, identifier); } // 4. Return ! CreateTemporalCalendar(identifier).