Changeset 28510 for trunk/src/wp-includes/class-wp-embed.php

Timestamp:

05/19/2014 05:46:56 AM (10 years ago)

Author:

wonderboymusic

Message:

Add access modifiers to methods/members in WP_Embed.

See #27881, #22234.

File:

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

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

@@ -8 +8 @@
  */
 class WP_Embed {
-    var $handlers = array();
-    var $post_ID;
-    var $usecache = true;
-    var $linkifunknown = true;
+    public $handlers = array();
+    public $post_ID;
+    public $usecache = true;
+    public $linkifunknown = true;
 
     /**
      * Constructor
      */
-    function __construct() {
+    public function __construct() {
         // Hack to get the [embed] shortcode to run before wpautop()
         add_filter( 'the_content', array( $this, 'run_shortcode' ), 8 );
@@ -48 +48 @@
      * @return string Content with shortcode parsed
      */
-    function run_shortcode( $content ) {
+    public function run_shortcode( $content ) {
         global $shortcode_tags;
 
@@ -70 +70 @@
      * an AJAX request that will call WP_Embed::cache_oembed().
      */
-    function maybe_run_ajax_cache() {
+    public function maybe_run_ajax_cache() {
         $post = get_post();
 
@@ -96 +96 @@
      * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
      */
-    function register_handler( $id, $regex, $callback, $priority = 10 ) {
+    public function register_handler( $id, $regex, $callback, $priority = 10 ) {
         $this->handlers[$priority][$id] = array(
             'regex'    => $regex,
@@ -109 +109 @@
      * @param int $priority Optional. The priority of the handler to be removed (default: 10).
      */
-    function unregister_handler( $id, $priority = 10 ) {
+    public function unregister_handler( $id, $priority = 10 ) {
         if ( isset($this->handlers[$priority][$id]) )
             unset($this->handlers[$priority][$id]);
@@ -140 +140 @@
      * @return string The embed HTML on success, otherwise the original URL.
      */
-    function shortcode( $attr, $url = '' ) {
+    public function shortcode( $attr, $url = '' ) {
         $post = get_post();
 
@@ -241 +241 @@
      * @param int $post_ID Post ID to delete the caches for.
      */
-    function delete_oembed_caches( $post_ID ) {
+    public function delete_oembed_caches( $post_ID ) {
         $post_metas = get_post_custom_keys( $post_ID );
         if ( empty($post_metas) )
@@ -257 +257 @@
      * @param int $post_ID Post ID to do the caching for.
      */
-    function cache_oembed( $post_ID ) {
+    public function cache_oembed( $post_ID ) {
         $post = get_post( $post_ID );
 
@@ -291 +291 @@
      * @return string Potentially modified $content.
      */
-    function autoembed( $content ) {
+    public function autoembed( $content ) {
         return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
     }
@@ -303 +303 @@
      * @return string The embed HTML on success, otherwise the original URL.
      */
-    function autoembed_callback( $match ) {
+    public function autoembed_callback( $match ) {
         $oldval = $this->linkifunknown;
         $this->linkifunknown = false;
@@ -318 +318 @@
      * @return string Linked URL or the original URL.
      */
-    function maybe_make_link( $url ) {
+    public function maybe_make_link( $url ) {
         $output = ( $this->linkifunknown ) ? '<a href="' . esc_url($url) . '">' . esc_html($url) . '</a>' : $url;