Allow the type argument to be passed through get_the_pagination() as long as its value isn't array.

See #29808

Built from https://develop.svn.wordpress.org/branches/4.1@30819


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

wp-includes/link-template.php

@@ -2314,8 +2314,11 @@ function get_the_pagination( $args = array() ) {
 			'next_text'          => __( 'Next' ),
 			'screen_reader_text' => __( 'Posts navigation' ),
 		) );
-		// Make sure we get plain links, so we can work with it.
-		$args['type'] = 'plain';
+
+		// Make sure we get a string back. Plain is the next best thing.
+		if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
+			$args['type'] = 'plain';
+		}
 
 		// Set up paginated links.
 		$links = paginate_links( $args );

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30818';
+$wp_version = '4.1-beta2-30819';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.