I would make sure he knows you're going to say yes if he does ask (either at Disney or elsewhere). Proposing is very scary and I don't think there are many men who would do a very public proposal if they thought there was a slight chance they would be rejected.
Remember that you had a fight for a reason (even if it's a stupid one) and if he thinks you might have doubts, I'm sure he won't propose.
Remember that you had a fight for a reason (even if it's a stupid one) and if he thinks you might have doubts, I'm sure he won't propose.