Changeset 38397

Timestamp:

08/27/2016 06:06:50 AM (8 years ago)

Author:

wonderboymusic

Message:

Press This: the file for the WP_Press_This class should not produce side effects. Similar to what we did in r38355 for WP_Site_Icon, drop the instances of global instantiation for $wp_press_this via loading the file. The variable can be set inline when necessary. In most of those places, if the global is already set, the file does not load and stomp it currently.

See #37699.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/class-wp-press-this.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3139 +3139 @@
     if ( empty( $GLOBALS['wp_press_this'] ) ) {
         include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+        $GLOBALS['wp_press_this'] = new WP_Press_This();
     }
 
@@ -3154 +3155 @@
     if ( empty( $GLOBALS['wp_press_this'] ) ) {
         include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+        $GLOBALS['wp_press_this'] = new WP_Press_This();
     }
 

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -1517 +1517 @@
     }
 }
-
-/**
- *
- * @global WP_Press_This $wp_press_this
- */
-$GLOBALS['wp_press_this'] = new WP_Press_This;

trunk/src/wp-admin/press-this.php

@@ -25 +25 @@
 if ( empty( $GLOBALS['wp_press_this'] ) ) {
     include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+    $GLOBALS['wp_press_this'] = new WP_Press_This();
 }
 

trunk/src/wp-includes/link-template.php

@@ -2911 +2911 @@
 
     include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+    $GLOBALS['wp_press_this'] = new WP_Press_This();
     $bookmarklet_version = $GLOBALS['wp_press_this']->version;
     $link = '';