Sorry if I made this one before, I have a feeling that I did.

Both!

It would be amazing if they had both, but if I had to choose one or the other, then intelligence. Funny, mentally challenged characters are great and all, but I prefer intelligent ones a bit more. (Of course, it depends if they're the main character or not.)

But not that important.

I suppose. Humorous characters are often nicer. In my experience when they try to make a character smart they usually try to show us this by making them somewhat snobbish or unfriendly.

Both, really...

I can like characters for all kinds of traits. I can think of a fair amount of intelligent Disney characters that I love, but I don't necessarily like them for their intelligence, initially. Whereas I think that there are some funny characters that I actually started to like thanks to their comedic moments.