Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

About Page: use the source of the Make/Core Embed response instead of discovering it (or reading from the cache) every time. 

Merge of [35826] to the 4.4 branch.
See #34663.

Built from https://develop.svn.wordpress.org/branches/4.4@35828


git-svn-id: http://core.svn.wordpress.org/branches/4.4@35792 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-12-08 03:44:25 +00:00
parent d4e91bb53a
commit 00f759f00b
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/about.php
View File

@ -83,17 +83,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
<div class="feature-section two-col">
<div class="col">
<div class="embed-container">
<?php
$embed1 = get_site_transient( 'about-page-embed-1' );
if ( false === $embed1 ) {
$embed1 = wp_oembed_get( 'https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/' );
if ( ! $embed1 ) {
$embed1 = '{{unknown}}';
}
set_site_transient( 'about-page-embed-1', $embed1 );
}
echo '{{unknown}}' !== $embed1 ? $embed1 : '';
?>
<blockquote data-secret="OcUe7B6Edh" class="wp-embedded-content"><a href="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/">New Embeds Feature in WordPress 4.4</a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;" src="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/embed/#?secret=OcUe7B6Edh" data-secret="OcUe7B6Edh" width="600" height="338" title="Embedded WordPress Post" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
</div>
<h3><?php _e( 'Embed your WordPress content' ); ?></h3>
<p><?php _e( 'Now you can embed your posts on other sites, even other WordPress sites. Simply drop a post URL into the editor and see an instant embed preview, complete with the title, excerpt, and featured image if you&#8217;ve set one. We&#8217;ll even include your site icon and links for comments and sharing.' ); ?></p>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-RC1-35827';
$wp_version = '4.4-RC1-35828';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.