From 959715939369961a16cccf80e865a24a46dde00e Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Thu, 27 Nov 2014 22:37:24 +0000 Subject: [PATCH] Better error message when the admin is ssl and non-ssl oEmbed previews are not available in the editor. Props Japh, fixes #30533. Built from https://develop.svn.wordpress.org/trunk@30591 git-svn-id: http://core.svn.wordpress.org/trunk@30581 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 303f3b2643..36cb488be8 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -2705,7 +2705,7 @@ function wp_ajax_parse_embed() { // Admin is ssl and the embed is not. Iframes, scripts, and other "active content" will be blocked. wp_send_json_error( array( 'type' => 'not-ssl', - 'message' => sprintf( __( 'Preview not available. %s cannot be embedded securely.' ), '' . esc_html( $url ) . '' ), + 'message' => __( 'This preview is unavailable in the editor.' ), ) ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 860105fc41..ed5538398e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30590'; +$wp_version = '4.1-beta2-30591'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.