Happily N'Ever After
(2007)

Ella (voice of Sarah Michelle Gellar)  defeats  Frieda (voice of  Sigourney Weaver) and fixes all the fairy tales that have gone wrong, and decides to marry Rick (voice of Freddie Prinze, Jr.) instead of The Prince (voice of Patrick Warburton).

The Wizard (voice of George Carlin) returns and never knows anything went wrong, and Mambo (voice of Andy Dick) and Munk (voice of Wallace Shawn) don't get in trouble.

Thanks Sam!