From 25e7ad64cf8a794a671633b3180b57bb41bc6ea2 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Sat, 3 Oct 2015 19:26:24 +0000
Subject: [PATCH] Use 'comments_per_page' option as fallback in
 `get_page_of_comment()`.

The function now uses the following order of precedence when calculating
comment pagination: 1. the 'per_page' value passed in the `$args` array,
2. the 'comments_per_page' query var in `$wp_query`, and 3. the
'comments_per_page' setting from options-discussion.php. This change allows
`get_page_of_comment()` to return an accurate value before the main query
has been run.

Props laceous.
See #13939.
Built from https://develop.svn.wordpress.org/trunk@34806


git-svn-id: http://core.svn.wordpress.org/trunk@34771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/comment-functions.php | 11 +++++++++--
 wp-includes/version.php           |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php
index ce6c2d0e82..280e15035e 100644
--- a/wp-includes/comment-functions.php
+++ b/wp-includes/comment-functions.php
@@ -855,8 +855,15 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( '' === $args['per_page'] )
-		$args['per_page'] = get_query_var('comments_per_page');
+	// Order of precedence: 1. `$args['per_page']`, 2. 'comments_per_page' query_var, 3. 'comments_per_page' option.
+	if ( '' === $args['per_page'] ) {
+		$args['per_page'] = get_query_var( 'comments_per_page' );
+	}
+
+	if ( '' === $args['per_page'] ) {
+		$args['per_page'] = get_option( 'comments_per_page' );
+	}
+
 	if ( empty($args['per_page']) ) {
 		$args['per_page'] = 0;
 		$args['page'] = 0;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2ff85c26c0..84b9461308 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34805';
+$wp_version = '4.4-alpha-34806';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.