Changeset 35235 for trunk/src/wp-includes/embed-functions.php

Timestamp:

10/17/2015 01:20:19 AM (8 years ago)

Author:

SergeyBiryukov

Message:

Embeds: Rename files, functions, and hooks added in [34903] to make it more clear what is oEmbed-specific and what isn't.

See https://core.trac.wordpress.org/ticket/34272#comment:7 for full list of renamed functions and hooks.

Props swissspidy.
Fixes #34272.

File:

• trunk/src/wp-includes/embed-functions.php (modified) (8 diffs)

trunk/src/wp-includes/embed-functions.php

@@ -465 +465 @@
     $output = "<script type='text/javascript'>\n";
     if ( SCRIPT_DEBUG ) {
-        $output .= file_get_contents( ABSPATH . WPINC . '/js/wp-oembed.js' );
+        $output .= file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' );
     } else {
         /*
          * If you're looking at a src version of this file, you'll see an "include"
          * statement below. This is used by the `grunt build` process to directly
-         * include a minified version of wp-oembed.js, instead of using the
+         * include a minified version of wp-embed.js, instead of using the
          * file_get_contents() method from above.
          *
          * If you're looking at a build version of this file, you'll see a string of
          * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
-         * and edit wp-oembed.js directly.
+         * and edit wp-embed.js directly.
          */
         $output .=<<<JS
-        include "js/wp-oembed.min.js"
+        include "js/wp-embed.min.js"
 JS;
     }
@@ -492 +492 @@
 
     /**
-     * Filter the oEmbed HTML output.
+     * Filter the embed HTML output for a given post.
      *
      * @since 4.4.0
@@ -501 +501 @@
      * @param int     $height Height of the response.
      */
-    return apply_filters( 'oembed_html', $output, $post, $width, $height );
+    return apply_filters( 'embed_html', $output, $post, $width, $height );
 }
 
@@ -749 +749 @@
  * @return string The modified excerpt.
  */
-function wp_oembed_excerpt_more( $more_string ) {
+function wp_embed_excerpt_more( $more_string ) {
     if ( ! is_embed() ) {
         return $more_string;
@@ -794 +794 @@
  * @return string The modified post excerpt.
  */
-function wp_oembed_excerpt_attachment( $content ) {
+function wp_embed_excerpt_attachment( $content ) {
     if ( is_attachment() ) {
         return prepend_attachment( '' );
@@ -807 +807 @@
  * @since 4.4.0
  */
-function print_oembed_embed_styles() {
+function print_embed_styles() {
     ?>
     <style type="text/css">
     <?php
         if ( SCRIPT_DEBUG ) {
-            readfile( ABSPATH . WPINC . "/css/wp-oembed-embed.css" );
+            readfile( ABSPATH . WPINC . "/css/wp-embed-template.css" );
         } else {
             /*
@@ -822 +822 @@
              * If you're looking at a build version of this file, you'll see a string of
              * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
-             * and edit wp-oembed-embed.css directly.
+             * and edit wp-embed-template.css directly.
              */
             ?>
-            include "css/wp-oembed-embed.min.css"
+            include "css/wp-embed-template.min.css"
             <?php
         }
@@ -838 +838 @@
  * @since 4.4.0
  */
-function print_oembed_embed_scripts() {
+function print_embed_scripts() {
     ?>
     <script type="text/javascript">
     <?php
         if ( SCRIPT_DEBUG ) {
-            readfile( ABSPATH . WPINC . "/js/wp-oembed-embed.js" );
+            readfile( ABSPATH . WPINC . "/js/wp-embed-template.js" );
         } else {
             /*
              * If you're looking at a src version of this file, you'll see an "include"
              * statement below. This is used by the `grunt build` process to directly
-             * include a minified version of wp-oembed-embed.js, instead of using the
+             * include a minified version of wp-embed-template.js, instead of using the
              * readfile() method from above.
              *
              * If you're looking at a build version of this file, you'll see a string of
              * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
-             * and edit wp-oembed-embed.js directly.
+             * and edit wp-embed-template.js directly.
              */
             ?>
-            include "js/wp-oembed-embed.min.js"
+            include "js/wp-embed-template.min.js"
             <?php
         }