Changeset 38361 for trunk/src/wp-includes/embed.php

Timestamp:

08/26/2016 09:48:32 AM (9 years ago)

Author:

wonderboymusic

Message:

OEmbed: move _wp_oembed_get_object() to embed.php, where all of the other embed functions live. WP_oEmbed is then in a file by itself. Load class-oembed.php in wp-settings.php and remove extraneous include calls.

See #37827.

File:

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

trunk/src/wp-includes/embed.php

@@ -95 +95 @@
  */
 function wp_oembed_get( $url, $args = '' ) {
-    require_once( ABSPATH . WPINC . '/class-oembed.php' );
     $oembed = _wp_oembed_get_object();
     return $oembed->get_html( $url, $args );
+}
+
+/**
+ * Returns the initialized WP_oEmbed object.
+ *
+ * @since 2.9.0
+ * @access private
+ *
+ * @staticvar WP_oEmbed $wp_oembed
+ *
+ * @return WP_oEmbed object.
+ */
+function _wp_oembed_get_object() {
+    static $wp_oembed = null;
+
+    if ( is_null( $wp_oembed ) ) {
+        $wp_oembed = new WP_oEmbed();
+    }
+    return $wp_oembed;
 }
 
@@ -113 +131 @@
  */
 function wp_oembed_add_provider( $format, $provider, $regex = false ) {
-    require_once( ABSPATH . WPINC . '/class-oembed.php' );
-
     if ( did_action( 'plugins_loaded' ) ) {
         $oembed = _wp_oembed_get_object();
@@ -134 +150 @@
  */
 function wp_oembed_remove_provider( $format ) {
-    require_once( ABSPATH . WPINC . '/class-oembed.php' );
-
     if ( did_action( 'plugins_loaded' ) ) {
         $oembed = _wp_oembed_get_object();
@@ -707 +721 @@
     }
 
-    require_once( ABSPATH . WPINC . '/class-oembed.php' );
     $wp_oembed = _wp_oembed_get_object();