From 2b48ca580e7f4f7e5fb96c289ad1ba36b70120f2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 1 Apr 2017 13:56:43 +0000
Subject: [PATCH] Embeds: Change the `embed_autourls` option filter from
 `default_option_*` to `pre_option_*` to avoid a DB query.

The option was removed from core in [21998], but still might be used by plugins.

Props dlh.
Fixes #38924.
Built from https://develop.svn.wordpress.org/trunk@40360


git-svn-id: http://core.svn.wordpress.org/trunk@40267 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/default-filters.php | 2 +-
 wp-includes/version.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 9b45abc9fd..7b8e6ce18b 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -348,7 +348,7 @@ add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
 add_filter( 'default_option_link_manager_enabled', '__return_true' );
 
 // This option no longer exists; tell plugins we always support auto-embedding.
-add_filter( 'default_option_embed_autourls', '__return_true' );
+add_filter( 'pre_option_embed_autourls', '__return_true' );
 
 // Default settings for heartbeat
 add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bb473267a5..1a7a792296 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-40359';
+$wp_version = '4.8-alpha-40360';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.