diff --git a/wp-content/themes/twentyten/attachment.php b/wp-content/themes/twentyten/attachment.php
index fe69187a35..b8f411dfa5 100644
--- a/wp-content/themes/twentyten/attachment.php
+++ b/wp-content/themes/twentyten/attachment.php
@@ -46,7 +46,7 @@
 						<div class="entry-caption"><?php if ( ! empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
 
 <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' )  ); ?>
-<?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
+<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 
 					</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index becfbc80dc..0d8e9d9e69 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -43,7 +43,7 @@
 
 			<div id="access">
 				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
-				<?php wp_nav_menu( 'sort_column=menu_order&container_class=menu-header' ); ?>
+				<?php wp_nav_menu( array( 'sort_column' => 'menu_order', 'container_class' => 'menu-header' ) ); ?>
 			</div><!-- #access -->
 		</div><!-- #masthead -->
 	</div><!-- #header -->
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index ba401a1ce1..b098b1f142 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -117,7 +117,7 @@
 	<?php else : ?>
 			<div class="entry-content">
 				<?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-				<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
+				<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 			</div><!-- .entry-content -->
 	<?php endif; ?>
 
diff --git a/wp-content/themes/twentyten/onecolumn-page.php b/wp-content/themes/twentyten/onecolumn-page.php
index a8c1bd997d..0bb7d9261a 100644
--- a/wp-content/themes/twentyten/onecolumn-page.php
+++ b/wp-content/themes/twentyten/onecolumn-page.php
@@ -15,7 +15,7 @@ get_header(); ?>
 					<h1 class="entry-title"><?php the_title(); ?></h1>
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
+						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-content -->
 				</div><!-- #post-<?php the_ID(); ?> -->
diff --git a/wp-content/themes/twentyten/page.php b/wp-content/themes/twentyten/page.php
index bd6bec9a7d..27d9c799e5 100644
--- a/wp-content/themes/twentyten/page.php
+++ b/wp-content/themes/twentyten/page.php
@@ -9,7 +9,7 @@
 					<h1 class="entry-title"><?php the_title(); ?></h1>
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
+						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-content -->
 				</div><!-- #post-<?php the_ID(); ?> -->
diff --git a/wp-content/themes/twentyten/single.php b/wp-content/themes/twentyten/single.php
index 18e28031bd..4543c11f69 100644
--- a/wp-content/themes/twentyten/single.php
+++ b/wp-content/themes/twentyten/single.php
@@ -23,7 +23,7 @@
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
+						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
 					</div><!-- .entry-content -->
 
 <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their decscription show a bio on their entries  ?>