Ticket #3450: wp_return2.diff

wp-includes/post-template.php

@@ -20 +20 @@
         $title = get_the_title();
         if ( strlen($title) > 0 ) {
                 $title = apply_filters('the_title', $before . $title . $after, $before, $after);
-                if ( $echo )
-                        echo $title;
-                else
-                        return $title;
+                return wp_return($title, $echo);
         }
 }
 
@@ -187 +184 @@
                 }
         }
 
-        if ( $echo )
-                echo $output;
-
-        return $output;
+        return wp_return($output, $echo);
 }
 
 
@@ -256 +250 @@
 
         $output = apply_filters('wp_dropdown_pages', $output);
 
-        if ( $echo )
-                echo $output;
-
-        return $output;
+        return wp_return($output, $echo);
 }
 
 function wp_list_pages($args = '') {

wp-includes/general-template.php

@@ -661 +661 @@
                 $previousday = $day;
         }
         $the_date = apply_filters('the_date', $the_date, $d, $before, $after);
-        if ( $echo )
-                echo $the_date;
-        else
-                return $the_date;
+
+        return wp_return($the_date, $echo);
 }
 
 

wp-includes/deprecated.php

@@ -44 +44 @@
         $categories = get_the_category();
         $cat = $categories[0]->cat_ID;
 
-        if ( $echo )
-                echo $cat;
-
-        return $cat;
+        return wp_return($cat, $echo);
 }
 
 // Deprecated.
@@ -481 +478 @@
 function get_author_link($echo = false, $author_id, $author_nicename = '') {
         $link = get_author_posts_url($author_id, $author_nicename);
 
-        if ( $echo )
-                echo $link;
-        return $link;
+        return wp_return($link, $echo);
 }
 
 function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page', $pagelink='%', $more_file='') {

wp-includes/feed.php

@@ -120 +120 @@
 
         $link = apply_filters('author_feed_link', $link);
 
-        if ( $echo )
-                echo $link;
-        return $link;
+        return wp_return($link, $echo);
 }
 
 
@@ -138 +136 @@
 
         $link = apply_filters('category_feed_link', $link);
 
-        if ( $echo )
-                echo $link;
-        return $link;
+        return wp_return($link, $echo);
 }
 
 

wp-includes/functions.php

@@ -498 +498 @@
         return $headers;
 }
 
+// Implementation within function:  return wp_return($func_data, $echo_flag);
+function wp_return($data, $echo = true) {
+        echo ( $echo ) ? $data : '';
+        return $data;
+}
+
 function is_new_day() {
         global $day, $previousday;
         if ( $day != $previousday ) {

wp-includes/bookmark-template.php

@@ -140 +140 @@
                 $output .= "$after\n";
         } // end while
 
-        if ( !$echo )
-                return $output;
-        echo $output;
+        return wp_return($output, $echo);
 }
 
 function get_linkrating($link) {
@@ -351 +349 @@
                 }
         }
 
-        if ( !$echo )
-                return $output;
-        echo $output;
+        return wp_return($output, $echo);
 }
 
 ?>

wp-includes/category-template.php

@@ -203 +203 @@
 
         $output = apply_filters('wp_dropdown_cats', $output);
 
-        if ( $echo )
-                echo $output;
-
-        return $output;
+        return wp_return($output, $echo);
 }
 
 function wp_list_categories($args = '') {