Changeset 28507

Timestamp:

05/19/2014 05:36:38 AM (12 years ago)

Author:

wonderboymusic

Message:

Add access modifier to methods/members in WP_oEmbed. Adds a magic __call() method for BC.

See #27881, #22234.

File:

• trunk/src/wp-includes/class-oembed.php (modified) (11 diffs)

trunk/src/wp-includes/class-oembed.php

@@ -19 +19 @@
  */
 class WP_oEmbed {
-        var $providers = array();
+        public $providers = array();
 
         /**
@@ -26 +26 @@
          * @uses apply_filters() Filters a list of pre-defined oEmbed providers.
          */
-        function __construct() {
+        public function __construct() {
                 $providers = array(
                         '#http://(www\.)?youtube\.com/watch.*#i'              => array( 'http://www.youtube.com/oembed',                      true  ),
@@ -78 +78 @@
 
         /**
+         * Make private/protected methods readable for backwards compatibility
+         *
+         * @since 4.0.0
+         * @param string $name
+         * @param array $arguments
+         * @return mixed
+         */
+        public function __call( $name, $arguments ) {
+                return call_user_func_array( array( $this, $name ), $arguments );
+        }
+
+        /**
          * The do-it-all function that takes a URL and attempts to return the HTML.
          *
@@ -88 +100 @@
          * @return bool|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
          */
-        function get_html( $url, $args = '' ) {
+        public function get_html( $url, $args = '' ) {
                 $provider = false;
 
@@ -133 +145 @@
          * @return bool|string False on failure, otherwise the oEmbed provider URL.
          */
-        function discover( $url ) {
+        public function discover( $url ) {
                 $providers = array();
 
@@ -199 +211 @@
          * @return bool|object False on failure, otherwise the result in the form of an object.
          */
-        function fetch( $provider, $url, $args = '' ) {
+        public function fetch( $provider, $url, $args = '' ) {
                 $args = wp_parse_args( $args, wp_embed_defaults() );
 
@@ -235 +247 @@
          * @return bool|object False on failure, otherwise the result in the form of an object.
          */
-        function _fetch_with_format( $provider_url_with_args, $format ) {
+        private function _fetch_with_format( $provider_url_with_args, $format ) {
                 $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
                 $response = wp_safe_remote_get( $provider_url_with_args );
@@ -252 +264 @@
          * @access private
          */
-        function _parse_json( $response_body ) {
+        private function _parse_json( $response_body ) {
                 return ( ( $data = json_decode( trim( $response_body ) ) ) && is_object( $data ) ) ? $data : false;
         }
@@ -262 +274 @@
          * @access private
          */
-        function _parse_xml( $response_body ) {
+        private function _parse_xml( $response_body ) {
                 if ( ! function_exists( 'libxml_disable_entity_loader' ) )
                         return false;
@@ -319 +331 @@
          * @return bool|string False on error, otherwise the HTML needed to embed.
          */
-        function data2html( $data, $url ) {
+        public function data2html( $data, $url ) {
                 if ( ! is_object( $data ) || empty( $data->type ) )
                         return false;
@@ -374 +386 @@
          * @return string Possibly modified $html
          */
-        function _strip_newlines( $html, $data, $url ) {
+        private function _strip_newlines( $html, $data, $url ) {
                 if ( false !== strpos( $html, "\n" ) )
                         $html = str_replace( array( "\r\n", "\n" ), '', $html );