diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
commit | b764f60728be1d4e026f9d7ae618ab47e23322f8 (patch) | |
tree | 1f1b45c4f1c1cf027b3240f605346e56209be8ff /wp-includes/post-template.php | |
parent | dad010666b767a1d06588d1d09c771c62f67c387 (diff) | |
download | wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.gz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.xz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.zip |
WP Merge to rev #4147
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/post-template.php')
-rw-r--r-- | wp-includes/post-template.php | 70 |
1 files changed, 33 insertions, 37 deletions
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 58ba562..d339c7f 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'] = '<p>' . __('Pages:'); - if ( !isset($r['after']) ) - $r['after'] = '</p>'; - 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'] = ''; - - link_pages($r['before'], $r['after'], $r['next_or_number'], $r['nextpagelink'], $r['previouspagelink'], $r['pagelink'], $r['more_file']); -} + if ( is_array($args) ) + $r = &$args; + else + parse_str($args, $r); + $defaults = array('before' => '<p>' . __('Pages:'), 'after' => '</p>', '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='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') { global $id, $page, $numpages, $multipage, $more, $pagenow; if ( $more_file != '' ) $file = $more_file; else $file = $pagenow; + + $output = ''; if ( $multipage ) { if ( 'number' == $next_or_number ) { - echo $before; + $output .= $before; for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) { $j = str_replace('%',"$i",$pagelink); - echo ' '; + $output .= ' '; if ( ($i != $page) || ((!$more) && ($page==1)) ) { - if ( '' == get_settings('permalink_structure') ) - echo '<a href="' . get_permalink() . '&page=' . $i . '">'; + if ( '' == get_option('permalink_structure') ) + $output .= '<a href="' . get_permalink() . '&page=' . $i . '">'; else - echo '<a href="' . trailingslashit( get_permalink() ) . $i . '/">'; + $output .= '<a href="' . trailingslashit( get_permalink() ) . $i . '/">'; } - echo $j; + $output .= $j; if ( ($i != $page) || ((!$more) && ($page==1)) ) - echo '</a>'; + $output .= '</a>'; } - echo $after; + $output .= $after; } else { if ( $more ) { - echo $before; + $output .= $before; $i = $page - 1; if ( $i && $more ) { - if ( '' == get_settings('permalink_structure') ) - echo '<a href="' . get_permalink() . '&page=' . $i . '">'.$previouspagelink.'</a>'; + if ( '' == get_option('permalink_structure') ) + $output .= '<a href="' . get_permalink() . '&page=' . $i . '">'.$previouspagelink.'</a>'; else - echo '<a href="' . get_permalink() . $i . '/">'.$previouspagelink.'</a>'; + $output .= '<a href="' . get_permalink() . $i . '/">'.$previouspagelink.'</a>'; } $i = $page + 1; if ( $i <= $numpages && $more ) { - if ( '' == get_settings('permalink_structure') ) - echo '<a href="'.get_permalink() . '&page=' . $i . '">'.$nextpagelink.'</a>'; + if ( '' == get_option('permalink_structure') ) + $output .= '<a href="'.get_permalink() . '&page=' . $i . '">'.$nextpagelink.'</a>'; else - echo '<a href="'.get_permalink().$i.'/">'.$nextpagelink.'</a>'; + $output .= '<a href="'.get_permalink().$i.'/">'.$nextpagelink.'</a>'; } - echo $after; + $output .= $after; } } } + + if ( $echo ) + echo $output; + + return $output; } @@ -268,7 +264,7 @@ function wp_list_pages($args = '') { else parse_str($args, $r); - $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_settings('date_format'), + $defaults = array('depth' => 0, 'show_date' => '', 'date_format' => get_option('date_format'), 'child_of' => 0, 'title_li' => __('Pages'), 'echo' => 1); $r = array_merge($defaults, $r); @@ -444,7 +440,7 @@ function prepend_attachment($content) { // function get_the_password_form() { - $output = '<form action="' . get_settings('siteurl') . '/wp-pass.php" method="post"> + $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post"> <p>' . __("This post is password protected. To view it please enter your password below:") . '</p> <p><label>' . __("Password:") . ' <input name="post_password" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . __("Submit") . '" /></p> </form> |