Comments-template echoes strange comment link

[reinkim]

After applying changeset [6368] comments_popup_link function in wp-includes/comments-template.php behalves differently from previous versions.

In [6368] comments_popup_link assembles $comments_popup_link variable, but in some execution path there are codes which echo the output, which should be appended to $comments_popup_link variable.

Problematic codes (all source lines from wp-includes/comments-template)

• function comments_number echoes its result
• function comments_link echoes its output

I made fix to the source (attached diff. file) which may need some tests.

[reinkim]

source diff

[pishmishy]

Confirmed. Tested patch, fixes issue. Needs to go into next release.

[ryan]

comments_number() can't be changed to always return since that could break some templates. We could hijack $deprecated and turn it into an $echo boolean, however.

[matt]

(In [6372]) Revert [6368]. Fixes #5448, fixes #5247 by adding a new filter to hook in specifically to add attributes, rather than filtering the whole thing. Minor formatting cleanup of comments_popup_link.