Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 15489)
+++ wp-includes/post-template.php	(working copy)
@@ -581,8 +581,24 @@
 
 	$output = '';
 	if ( $multipage ) {
-		if ( 'number' == $next_or_number ) {
-			$output .= $before;
+		$output .= $before;
+		if ( 'next' == $next_or_number || 'next_and_number' == $next_or_number ) {
+			$i = $page - 1;
+			if ( $i && $more ) {
+				if ( 1 == $i ) {
+					$output .= '<a href="' . get_permalink() . '">';
+				} else {
+					if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
+						$output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+					elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+						$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
+					else
+						$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
+				}
+				$output .= $link_before. $previouspagelink . $link_after . '</a>';
+			}
+		}
+		if ( 'number' == $next_or_number || 'next_and_number' == $next_or_number ) {
 			for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) {
 				$j = str_replace('%',$i,$pagelink);
 				$output .= ' ';
@@ -605,41 +621,24 @@
 				if ( ($i != $page) || ((!$more) && ($page==1)) )
 					$output .= '</a>';
 			}
-			$output .= $after;
-		} else {
-			if ( $more ) {
-				$output .= $before;
-				$i = $page - 1;
-				if ( $i && $more ) {
-					if ( 1 == $i ) {
-						$output .= '<a href="' . get_permalink() . '">';
-					} else {
-						if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-							$output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
-						elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-							$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
-						else
-							$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
-					}
-					$output .= $link_before. $previouspagelink . $link_after . '</a>';
+		}
+		if ( 'next' == $next_or_number || 'next_and_number' == $next_or_number ) {
+			$i = $page + 1;
+			if ( $i <= $numpages && $more ) {
+				if ( 1 == $i ) {
+					$output .= '<a href="' . get_permalink() . '">';
+				} else {
+					if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
+						$output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
+					elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
+						$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
+					else
+						$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
 				}
-				$i = $page + 1;
-				if ( $i <= $numpages && $more ) {
-					if ( 1 == $i ) {
-						$output .= '<a href="' . get_permalink() . '">';
-					} else {
-						if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-							$output .= '<a href="' . add_query_arg('page', $i, get_permalink()) . '">';
-						elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-							$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit('page/' . $i, 'single_paged'). '">';
-						else
-							$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
-					}
-					$output .= $link_before. $nextpagelink . $link_after . '</a>';
-				}
-				$output .= $after;
+				$output .= $link_before. $nextpagelink . $link_after . '</a>';
 			}
 		}
+		$output .= $after;
 	}
 
 	if ( $echo )