WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comments: Add back `$req` variable in `comments_template()`. 

The variables in `comments_template()` should never be assumed to be unused. This function includes the `comments.php` template file from the active theme or falls back to `theme-compat/comments.php`. This is why including a file within a function only brings pain and sorrow.

Reverts r36322.

See #35473.
Built from https://develop.svn.wordpress.org/trunk@36425


git-svn-id: http://core.svn.wordpress.org/trunk@36392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Rachel Baker 2016-01-30 22:13:26 +00:00
parent 099b35933d
commit 2573fa7ab8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/comment-template.php
View File

@ -1256,6 +1256,8 @@ function comments_template( $file = '/comments.php', $separate_comments = false
if ( empty($file) ) if ( empty($file) )
$file = '/comments.php'; $file = '/comments.php';
$req = get_option('require_name_email');
/* /*
* Comment author information fetched from the comment cookies. * Comment author information fetched from the comment cookies.
*/ */

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36424'; $wp_version = '4.5-alpha-36425';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.