I simply report the news and NOT rumors!
The ONLY confirmed (by Disney herself!) news are the news from Siggraph 2005... others are only rumors!
And also the main page of UltimateDisney reports this at this link: http://www.ultimatedisney.com/intheaters.html
Why UltimateDisney hasn't change the plot? Simply because it's this the plot...Rapunzel - Certain films attract buzz from an early stage. Often these projects hold a best-selling book as a source or carry a world famous superhero in the title. This computer-animated project doesn't quite fit either of those requirements, but Disney fans have been excited by it for years, even though it has been repeatedly bumped and always off in the distance.
Longtime A-list Disney animator Glen Keane (supervising animator of such protagonists as Ariel, Beast, Aladdin, Pocahontas, and Tarzan) simultaneously makes his directorial and CGI debuts in this new take on the classic fairy tale of a long-haired princess and her valiant prince. Here, a frustrated witch brings two romantically-challenged teenagers from the real world into that of the story, casting them as Rapunzel and her prince. Broadway veteran Kristin Chenoweth (who starred in the Wonderful World of Disney musicals Annie and The Music Man) will voice Rapunzel, while another stage actor (Dan Fogler) will lend his vocals to the prince.
Fantasmic, the modern references aren't irrelevant... it's the main problem...
In any case, if it will be confirmed that you are right, I'll apologize... but I doubt because we all know what are officials news... you base your considerations of rumors not yet confirmed... but rumors are rumors and news are news...
I stop to post here... bye bye... see you soon