Ticket #2834: template-functions-links.php.diff

.php

@@ -445 +445 @@
         return $qstr;
 }
 
-function next_posts($max_page = 0) { // original by cfactor at cooltux.org
+function next_posts($max_page = 0) {
+        print next_posts_text($max_page);
+}
+
+function next_posts_text($max_page = 0) { // original by cfactor at cooltux.org
         global $paged, $pagenow;
 
         if ( !is_single() ) {
@@ -453 +457 @@
                         $paged = 1;
                 $nextpage = intval($paged) + 1;
                 if ( !$max_page || $max_page >= $nextpage )
-                        echo get_pagenum_link($nextpage);
+                        return get_pagenum_link($nextpage);
         }
 }
 
 function next_posts_link($label='Next Page »', $max_page=0) {
+        print next_posts_link_text($label, $max_page);
+}
+
+function next_posts_link_text($label='Next Page »', $max_page=0) {
         global $paged, $result, $request, $posts_per_page, $wpdb, $max_num_pages;
         if ( !$max_page ) {
                         if ( isset($max_num_pages) ) {
@@ -473 +481 @@
                 $paged = 1;
         $nextpage = intval($paged) + 1;
         if ( (! is_single()) && (empty($paged) || $nextpage <= $max_page) ) {
-                echo '<a href="';
-                next_posts($max_page);
-                echo '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+                $np_text = next_posts_text($max_page);
+                
+                if ($np_text) {
+                        $result = '<a href="';
+                        $result .= $np_text;
+                        $result .= '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+                        return $result;
+                }
         }
+        
+        return false;
 }
 
 
-function previous_posts() { // original by cfactor at cooltux.org
+function previous_posts() {
+        print previous_posts_text();
+}
+
+function previous_posts_text() { // original by cfactor at cooltux.org
         global $paged, $pagenow;
 
         if ( !is_single() ) {
                 $nextpage = intval($paged) - 1;
                 if ( $nextpage < 1 )
                         $nextpage = 1;
-                echo get_pagenum_link($nextpage);
+                return get_pagenum_link($nextpage);
         }
 }
 
-
 function previous_posts_link($label='&laquo; Previous Page') {
+        print previous_posts_link_text($label);
+}
+
+function previous_posts_link_text($label='&laquo; Previous Page') {
         global $paged;
         if ( (!is_single())     && ($paged > 1) ) {
-                echo '<a href="';
-                previous_posts();
-                echo '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+                $pp_text = previous_posts_text();
+
+                if ($pp_text) {
+                        $result = '<a href="';
+                        $result .= $pp_text;
+                        $result .= '">'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+                        return $result;
+                }
         }
+        
+        return false;
 }
 
 function posts_nav_link($sep=' &#8212; ', $prelabel='&laquo; Previous Page', $nxtlabel='Next Page &raquo;') {