From 5ec9a2aeb4ca846308fdfb7bf6f54437addc03da Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Wed, 24 Feb 2016 22:12:25 +0000 Subject: [PATCH] Revert r36696 This broke embeds. Needs a better solution to also make sure all queries from the REST API aren't broken. see #35907. Built from https://develop.svn.wordpress.org/trunk@36699 git-svn-id: http://core.svn.wordpress.org/trunk@36666 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/query.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/query.php b/wp-includes/query.php index 76a17bfd0a..4b3e1e41f7 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -3705,7 +3705,7 @@ class WP_Query { // Put sticky posts at the top of the posts array $sticky_posts = get_option('sticky_posts'); - if ( ( $this->is_home || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_sticky_posts'] ) { + if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_sticky_posts'] ) { $num_posts = count($this->posts); $sticky_offset = 0; // Loop over posts and relocate stickies to the front. diff --git a/wp-includes/version.php b/wp-includes/version.php index 2335d0ccc0..f9b8e497fa 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-36698'; +$wp_version = '4.5-alpha-36699'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.