Don't stomp existing sizes inside wp_save_image().

props markoheijnen.
see #22985.
for trunk.



git-svn-id: http://core.svn.wordpress.org/trunk@23246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Don't include the default columns="3" in a gallery shortcode.

Shortcode attributes are strings; fix a variable type error in wp.media.gallery defaults.
props adamsilverstein.

see #22919.


git-svn-id: http://core.svn.wordpress.org/trunk@23247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Ensure that get_archive_template() only loads a post type archive (archive-$post_type.php file) if there is exactly one post type in the query.

props scribu.
see #22956.
for trunk.



git-svn-id: http://core.svn.wordpress.org/trunk@23249 1a063a9b-81f0-0310-95a4-ce76da25c4cd