From 2573fa7ab873b78e7715eb34c88f140b9db7ce38 Mon Sep 17 00:00:00 2001
From: Rachel Baker <rachel@rachelbaker.me>
Date: Sat, 30 Jan 2016 22:13:26 +0000
Subject: [PATCH] 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
---
 wp-includes/comment-template.php | 2 ++
 wp-includes/version.php          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 77a4dcd904..a1093b74ac 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1256,6 +1256,8 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 	if ( empty($file) )
 		$file = '/comments.php';
 
+	$req = get_option('require_name_email');
+
 	/*
 	 * Comment author information fetched from the comment cookies.
 	 */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e757f07fb1..91abb9af24 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.