Changeset 4142

Timestamp:

08/30/2006 09:00:37 PM (20 years ago)

Author:

ryan

Message:

Deprecate link_pages(). Clean up wp_link_pages().

Location:

trunk/wp-includes

Files:

• deprecated.php (modified) (1 diff)
• post-template.php (modified) (2 diffs)

trunk/wp-includes/deprecated.php

@@ -487 +487 @@
 }
 
+function link_pages($before='<br />', $after='<br />', $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);
+}
+
 ?>

trunk/wp-includes/post-template.php

@@ -128 +128 @@
 
 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']);
-}
-
-
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $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);
+
     global $id, $page, $numpages, $multipage, $more, $pagenow;
     if ( $more_file != '' )
@@ -154 +143 @@
     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() . '&amp;page=' . $i . '">';
+                        $output .= '<a href="' . get_permalink() . '&amp;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() . '&amp;page=' . $i . '">'.$previouspagelink.'</a>';
+                        $output .= '<a href="' . get_permalink() . '&amp;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() . '&amp;page=' . $i . '">'.$nextpagelink.'</a>';
+                        $output .= '<a href="'.get_permalink() . '&amp;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;
 }