diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index bba457adb..c65d06b40 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -486,4 +486,9 @@ function get_author_link($echo = false, $author_id, $author_nicename = '') {
return $link;
}
+function link_pages($before='
', $after='
', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') {
+ $args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
+ return wp_link_pages($args);
+}
+
?>
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 58ba562b2..436217658 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -127,70 +127,66 @@ function get_the_excerpt($fakeit = true) {
function wp_link_pages($args = '') {
- parse_str($args, $r);
- if ( !isset($r['before']) )
- $r['before'] = '
' . __('Pages:'); - if ( !isset($r['after']) ) - $r['after'] = '
'; - if ( !isset($r['next_or_number']) ) - $r['next_or_number'] = 'number'; - if ( !isset($r['nextpagelink']) ) - $r['nextpagelink'] = 'Next page'; - if ( !isset($r['previouspagelink']) ) - $r['previouspagelink'] = 'Previous page'; - if ( !isset($r['pagelink']) ) - $r['pagelink'] = '%'; - if ( !isset($r['more_file']) ) - $r['more_file'] = ''; + if ( is_array($args) ) + $r = &$args; + else + parse_str($args, $r); - link_pages($r['before'], $r['after'], $r['next_or_number'], $r['nextpagelink'], $r['previouspagelink'], $r['pagelink'], $r['more_file']); -} + $defaults = array('before' => '' . __('Pages:'), 'after' => '
', 'next_or_number' => 'number', 'nextpagelink' => __('Next page'), + 'previouspagelink' => __('Previous page'), 'pagelink' => '%', 'more_file' => '', 'echo' => 1); + $r = array_merge($defaults, $r); + extract($r); - -function link_pages($before='