Index: wp-includes/query.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/query.php	(revision abbcc015422cdf1174cefed69d5313d232a769f0)
+++ wp-includes/query.php	(revision )
@@ -1747,6 +1747,9 @@
 				$post_type_obj = get_post_type_object( $qv['post_type'] );
 				if ( ! empty( $post_type_obj->has_archive ) )
 					$this->is_post_type_archive = true;
+
+				if ( !is_admin() && ! empty( $post_type_obj->posts_per_archive_page ) )
+					$qv['posts_per_archive_page'] = $post_type_obj->posts_per_archive_page;
 			}
 
 			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
Index: wp-includes/post.php
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- wp-includes/post.php	(revision abbcc015422cdf1174cefed69d5313d232a769f0)
+++ wp-includes/post.php	(revision )
@@ -1015,31 +1015,32 @@
 
 	// Args prefixed with an underscore are reserved for internal use.
 	$defaults = array(
-		'labels'               => array(),
+			'labels'                 => array(),
-		'description'          => '',
+			'description'            => '',
-		'public'               => false,
+			'public'                 => false,
-		'hierarchical'         => false,
+			'hierarchical'           => false,
-		'exclude_from_search'  => null,
+			'exclude_from_search'    => null,
-		'publicly_queryable'   => null,
+			'publicly_queryable'     => null,
-		'show_ui'              => null,
+			'show_ui'                => null,
-		'show_in_menu'         => null,
+			'show_in_menu'           => null,
-		'show_in_nav_menus'    => null,
+			'show_in_nav_menus'      => null,
-		'show_in_admin_bar'    => null,
+			'show_in_admin_bar'      => null,
-		'menu_position'        => null,
+			'menu_position'          => null,
-		'menu_icon'            => null,
+			'menu_icon'              => null,
-		'capability_type'      => 'post',
+			'capability_type'        => 'post',
-		'capabilities'         => array(),
+			'capabilities'           => array(),
-		'map_meta_cap'         => null,
+			'map_meta_cap'           => null,
-		'supports'             => array(),
+			'supports'               => array(),
-		'register_meta_box_cb' => null,
+			'register_meta_box_cb'   => null,
-		'taxonomies'           => array(),
+			'taxonomies'             => array(),
-		'has_archive'          => false,
+			'has_archive'            => false,
-		'rewrite'              => true,
+			'rewrite'                => true,
-		'query_var'            => true,
+			'query_var'              => true,
-		'can_export'           => true,
+			'can_export'             => true,
-		'delete_with_user'     => null,
+			'delete_with_user'       => null,
+			'posts_per_archive_page' => null,
-		'_builtin'             => false,
+			'_builtin'               => false,
-		'_edit_link'           => 'post.php?post=%d',
+			'_edit_link'             => 'post.php?post=%d',
 	);
 	$args = array_merge( $defaults, $args );
 	$args = (object) $args;